diff --git a/.circleci/scripts/chrome-install.sh b/.circleci/scripts/chrome-install.sh
index fd20877f8..ccf458111 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='93.0.4577.63-1'
+CHROME_VERSION='95.0.4638.69-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='4102ba417b41820da68b7e8e12018ed2268f30e0210f8f227aeeabf6bd9265dd95ad206993d5626ac1c70a07185fd3ed4eef8a71ee2f5b0770015302c0d26f58'
+CHROME_BINARY_SHA512SUM='f07d16ec0a41120c40064d030e9e5240ed740b9b24c50eaede7b9bfd9a9678821c0252b40bfcd57e933a708b08d761482c3be5b3006eee605c41f5dc9e21f456'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index c99ca2f85..15f3c91b9 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -1,49 +1,48 @@
 # things that *are* used, that depcheck is wrong about
 ignores:
-  # 
+  #
   # webapp deps
-  # 
+  #
 
-  - "@babel/runtime"
-  - "@fortawesome/fontawesome-free"
-  - "punycode"
-  
-  # 
+  - '@babel/runtime'
+  - '@fortawesome/fontawesome-free'
+  - 'punycode'
+
+  #
   # dev deps
   #
 
   # safety fallback for npm lifecycle scripts, not used normally
-  - "@lavamoat/preinstall-always-fail"
+  - '@lavamoat/preinstall-always-fail'
   # used in testing + ci
-  - "@metamask/auto-changelog" # invoked as `auto-changelog`
-  - "@metamask/forwarder"
-  - "@metamask/test-dapp"
-  - "@sentry/cli" # invoked as `sentry-cli`
-  - "chromedriver"
-  - "depcheck" # ooo meta
-  - "ganache-cli"
-  - "geckodriver"
-  - "jest" 
-  - "lavamoat-viz"
-  - "prettier-plugin-sort-json" # automatically imported by prettier
-  - "source-map-explorer"
+  - '@metamask/auto-changelog' # invoked as `auto-changelog`
+  - '@metamask/forwarder'
+  - '@metamask/test-dapp'
+  - '@sentry/cli' # invoked as `sentry-cli`
+  - 'chromedriver'
+  - 'depcheck' # ooo meta
+  - 'ganache-cli'
+  - 'geckodriver'
+  - 'jest'
+  - 'lavamoat-viz'
+  - 'prettier-plugin-sort-json' # automatically imported by prettier
+  - 'source-map-explorer'
   # development tool
-  - "yarn-deduplicate"
-  - "improved-yarn-audit"
+  - 'yarn-deduplicate'
+  - 'improved-yarn-audit'
   # storybook
-  - "@storybook/core"
-  - "@storybook/addon-backgrounds"
-  - "@storybook/addon-toolbars"
-  - "style-loader"
-  - "css-loader"
-  - "sass-loader"
-  - "resolve-url-loader"
+  - '@storybook/core'
+  - '@storybook/addon-essentials'
+  - '@storybook/addon-a11y'
+  - 'style-loader'
+  - 'css-loader'
+  - 'sass-loader'
+  - 'resolve-url-loader'
 
-# files depcheck should not parse 
+# files depcheck should not parse
 ignorePatterns:
   # seems to incorrectly parse scss @include pragmas?
-  - "**/*.scss"
+  - '**/*.scss'
   # self-contained bundle used for testing
-  - "**/send-eth-with-private-key-test/web3js.js"
-  - "**/send-eth-with-private-key-test/ethereumjs-tx.js"
-  
+  - '**/send-eth-with-private-key-test/web3js.js'
+  - '**/send-eth-with-private-key-test/ethereumjs-tx.js'
diff --git a/.eslintrc.js b/.eslintrc.js
index b2967de39..17b766601 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,3 +1,5 @@
+const { version: reactVersion } = require('react/package.json');
+
 module.exports = {
   root: true,
   parser: '@babel/eslint-parser',
@@ -189,9 +191,10 @@ module.exports = {
         'app/scripts/lockdown-more.js',
         'development/**/*.js',
         'test/e2e/**/*.js',
-        'test/lib/wait-until-called.js',
         'test/env.js',
         'test/setup.js',
+        'test/helpers/protect-intrinsics-helpers.js',
+        'test/lib/wait-until-called.js',
         'jest.config.js',
       ],
       parserOptions: {
@@ -202,6 +205,7 @@ module.exports = {
       files: [
         'app/scripts/lockdown-run.js',
         'app/scripts/lockdown-more.js',
+        'test/helpers/protect-intrinsics-helpers.js',
         'test/unit-global/protect-intrinsics.test.js',
       ],
       globals: {
@@ -213,7 +217,12 @@ module.exports = {
 
   settings: {
     react: {
-      version: 'detect',
+      // If this is set to 'detect', ESLint will import React in order to find
+      // its version. Because we run ESLint in the build system under LavaMoat,
+      // this means that detecting the React version requires a LavaMoat policy
+      // for all of React, in the build system. That's a no-go, so we grab it
+      // from React's package.json.
+      version: reactVersion,
     },
   },
 };
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..f945eb7b7
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ develop, Version-v*, cla-signatures, master, snaps ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ develop ]
+  schedule:
+    - cron: '28 12 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.storybook/i18n-party-addon/register.js b/.storybook/i18n-party-addon/register.js
index 20175a80e..bfa482045 100644
--- a/.storybook/i18n-party-addon/register.js
+++ b/.storybook/i18n-party-addon/register.js
@@ -1,37 +1,41 @@
 // import { useGlobals } from '@storybook/api';
-const { useGlobals } = require('@storybook/api')
-const React = require("react")
-const { addons, types } = require("@storybook/addons")
-const { Icons, IconButton } = require('@storybook/components')
-const localeList = require('../../app/_locales/index.json')
-const { useEffect } = React
+const { useGlobals } = require('@storybook/api');
+const React = require('react');
+const { addons, types } = require('@storybook/addons');
+const { Icons, IconButton } = require('@storybook/components');
+const localeList = require('../../app/_locales/index.json');
+const { useEffect } = React;
 
-addons.register("i18n-party", () => {
-
-  addons.add("i18n-party", {
-    title: "rotates through every i18n locale",
+addons.register('i18n-party', () => {
+  addons.add('i18n-party', {
+    title: 'rotates through every i18n locale',
     //👇 Sets the type of UI element in Storybook
     type: types.TOOL,
     match: () => true,
     render: (...args) => {
       // https://github.com/storybookjs/storybook/blob/6490a0d646dbaa293b76bbde477daca615efe789/addons/toolbars/src/components/MenuToolbar.tsx#L2
-      const [globals, updateGlobals] = useGlobals()
+      const [globals, updateGlobals] = useGlobals();
       useEffect(() => {
-        if (!globals.localeParty) return
+        if (!globals.localeParty) return;
         const interval = setInterval((...args) => {
-          const currentIndex = localeList.findIndex(({ code }) => code === globals.locale)
-          const nextIndex = (currentIndex + 1) % localeList.length
-          const nextLocale = localeList[nextIndex].code
-          updateGlobals({ locale: nextLocale })
-        }, 2000)
-        return () => clearInterval(interval)
-      })
+          const currentIndex = localeList.findIndex(
+            ({ code }) => code === globals.locale,
+          );
+          const nextIndex = (currentIndex + 1) % localeList.length;
+          const nextLocale = localeList[nextIndex].code;
+          updateGlobals({ locale: nextLocale });
+        }, 2000);
+        return () => clearInterval(interval);
+      });
 
       return (
-        <IconButton onClick={() => updateGlobals({ localeParty: !globals.localeParty })}>
-          <Icons icon={globals.localeParty ? 'star' : 'starhollow'}/>
+        <IconButton
+          onClick={() => updateGlobals({ localeParty: !globals.localeParty })}
+        >
+          <Icons icon={globals.localeParty ? 'star' : 'starhollow'} />
+          <span>&nbsp;Shuffle i18n locale</span>
         </IconButton>
-      )
+      );
     },
-  })
-})
+  });
+});
diff --git a/.storybook/main.js b/.storybook/main.js
index 843c63b77..5255babda 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -3,19 +3,21 @@ const path = require('path');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-  stories: ['../ui/**/*.stories.js'],
+  stories: ['../ui/**/*.stories.js', '../ui/**/*.stories.mdx'],
   addons: [
-    '@storybook/addon-knobs',
+    '@storybook/addon-essentials',
     '@storybook/addon-actions',
-    '@storybook/addon-backgrounds',
-    '@storybook/addon-toolbars',
+    '@storybook/addon-a11y',
+    '@storybook/addon-knobs',
     './i18n-party-addon/register.js',
   ],
+  // Uses babel.config.js settings and prevents "Missing class properties transform" error
+  babel: async (options) => ({ overrides: options.overrides }),
   webpackFinal: async (config) => {
-    config.context = process.cwd()
+    config.context = process.cwd();
     config.node = {
-      __filename: true
-    }
+      __filename: true,
+    };
     config.module.strictExportPresence = true;
     config.module.rules.push({
       test: /\.scss$/,
diff --git a/.storybook/preview.js b/.storybook/preview.js
index 30f6d69ea..71fa49be3 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -8,11 +8,11 @@ import '../ui/css/index.scss';
 import localeList from '../app/_locales/index.json';
 import * as allLocales from './locales';
 import { I18nProvider, LegacyI18nProvider } from './i18n';
-import MetaMetricsProviderStorybook from './metametrics'
+import MetaMetricsProviderStorybook from './metametrics';
 import testData from './test-data.js';
-import { Router } from "react-router-dom";
-import { createBrowserHistory } from "history";
-import { _setBackgroundConnection } from '../ui/store/actions'
+import { Router } from 'react-router-dom';
+import { createBrowserHistory } from 'history';
+import { _setBackgroundConnection } from '../ui/store/actions';
 
 addParameters({
   backgrounds: {
@@ -38,28 +38,24 @@ export const globalTypes = {
   },
 };
 
-const styles = {
-  height: '100vh',
-  display: 'flex',
-  justifyContent: 'center',
-  alignItems: 'center',
-};
-
 export const getNewState = (state, props) => {
   return Object.assign(state, props);
-}
+};
 
 export const store = configureStore(testData);
 const history = createBrowserHistory();
-const proxiedBackground = new Proxy({}, {
+const proxiedBackground = new Proxy(
+  {},
+  {
     get(_, method) {
-      return function() {
-        action(`Background call: ${method}`)()
-        return new Promise(() => {})
-      }
-    }
-  })
-_setBackgroundConnection(proxiedBackground)
+      return function () {
+        action(`Background call: ${method}`)();
+        return new Promise(() => {});
+      };
+    },
+  },
+);
+_setBackgroundConnection(proxiedBackground);
 
 const metamaskDecorator = (story, context) => {
   const currentLocale = context.globals.locale;
@@ -73,9 +69,7 @@ const metamaskDecorator = (story, context) => {
             current={current}
             en={allLocales.en}
           >
-            <LegacyI18nProvider>
-              <div style={styles}>{story()}</div>
-            </LegacyI18nProvider>
+            <LegacyI18nProvider>{story()}</LegacyI18nProvider>
           </I18nProvider>
         </MetaMetricsProviderStorybook>
       </Router>
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index 28c5c15c8..398ef19b1 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -1258,7 +1258,6 @@ const state = {
       ledger: "m/44'/60'/0'/0/0",
     },
     networksTabSelectedRpcUrl: '',
-    networksTabIsInAddMode: false,
     loadingMethodData: false,
     show3BoxModalAfterImport: false,
     threeBoxLastUpdated: null,
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index cd4ff6d0d..aa341612d 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "ክፍያ መጨመር የመከወኛ ጊዜን ሊቀንስ ቢችልም ይህ ግን ዋስትና የለውም።"
   },
-  "customRPC": {
-    "message": "ብጁ RPC"
-  },
   "customToken": {
     "message": "ብጁ ተለዋጭ ስም"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "አስርዮሽ ቢያንስ 0 ቢበዛ ደግሞ 36 መሆን አለባቸው።"
   },
-  "defaultNetwork": {
-    "message": "የ Ether ግብይቶች ንቡር አውታረ መረብ Mainnet ነው።"
-  },
   "delete": {
     "message": "ሰርዝ"
   },
@@ -620,9 +614,6 @@
   "newContract": {
     "message": "አዲስ ኮንትራት"
   },
-  "newNetwork": {
-    "message": "አዲስ አውታረ መረብ"
-  },
   "newPassword": {
     "message": "አዲስ የይለፍ ቃል (ቢያንስ 8 ቁምፊዎች)"
   },
@@ -671,12 +662,6 @@
   "on": {
     "message": "በርቷል"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "ኤክስፕሎረር URL አግድ (አማራጭ)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "ምልክት (አማራጭ)"
-  },
   "origin": {
     "message": "መነሻ"
   },
@@ -856,9 +841,6 @@
   "selectAnAccount": {
     "message": "መለያ ይምረጡ"
   },
-  "selectAnAccountHelp": {
-    "message": "መለያውን በ MetaMask ለማየት ይምረጡ"
-  },
   "selectEachPhrase": {
     "message": "እባክዎ እያንዳንዱን ሐረግ በመምረጥ ትክክለኛነቱን ያረጋግጡ።"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index 46f05e1ef..aa6a76276 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "قد تؤدي زيادة الرسوم إلى تقليل أزمنة المعالجة، ولكن ذلك غير مضمون."
   },
-  "customRPC": {
-    "message": "آر بي سي مخصص"
-  },
   "customToken": {
     "message": "عملة رمزية مخصصة"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "يجب أن تكون الكسور العشرية صفراً على الأقل، وألا تزيد عن 36 كسراً."
   },
-  "defaultNetwork": {
-    "message": "الشبكة الافتراضية لمعاملات الأثير هي الشبكة الرئيسية."
-  },
   "delete": {
     "message": "حذف"
   },
@@ -616,9 +610,6 @@
   "newContract": {
     "message": "عقد جديد"
   },
-  "newNetwork": {
-    "message": "شبكة جديدة"
-  },
   "newPassword": {
     "message": "كلمة مرور جديدة (8 أحرف كحد أدنى)"
   },
@@ -667,12 +658,6 @@
   "on": {
     "message": "تشغيل"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "العنوان الإلكتروني لمستكشف البلوكات (اختياري)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "الرمز (اختياري)"
-  },
   "origin": {
     "message": "الأصل"
   },
@@ -852,9 +837,6 @@
   "selectAnAccount": {
     "message": "قم بتحديد حساب"
   },
-  "selectAnAccountHelp": {
-    "message": "حدد الحساب لعرضه في MetaMask"
-  },
   "selectEachPhrase": {
     "message": "يُرجى تحديد كل عبارة للتأكد من صحتها."
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index 85db5cf66..f9cabde5d 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Увеличаването на таксата може да намали времето за обработка, но това не е гарантирано."
   },
-  "customRPC": {
-    "message": "RPC по избор"
-  },
   "customToken": {
     "message": "Персонализиран маркер"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Десетичните знаци трябва да бъдат най-малко 0 и не повече от 36."
   },
-  "defaultNetwork": {
-    "message": "Мрежата по подразбиране за Ether транзакции е Mainnet."
-  },
   "delete": {
     "message": "Изтриване"
   },
@@ -619,9 +613,6 @@
   "newContract": {
     "message": "Нов договор"
   },
-  "newNetwork": {
-    "message": "Нова мрежа"
-  },
   "newPassword": {
     "message": "Нова парола (мин. 8 символа)"
   },
@@ -670,12 +661,6 @@
   "on": {
     "message": "Включено"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Блокиране на Explorer URL (по избор)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Символ (по избор)"
-  },
   "origin": {
     "message": "Произход"
   },
@@ -855,9 +840,6 @@
   "selectAnAccount": {
     "message": "Изберете акаунт"
   },
-  "selectAnAccountHelp": {
-    "message": "Изберете акаунта за преглед в MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Моля, изберете всяка фраза, за да се уверите, че е правилна."
   },
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 92f31381d..5d36aabe9 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "ফী বৃদ্ধি করা প্রক্রিয়াকরণের সময় কমাতে পারে, কিন্তু সেটির নিশ্চয়তা দেওয়া হয় না।"
   },
-  "customRPC": {
-    "message": "কাস্টম RPC"
-  },
   "customToken": {
     "message": "কাস্টম টোকেন"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "দশমিকগুলি অবশ্যই অন্তত 0 হতে হবে, এবং 36 এর উপর হবে না।"
   },
-  "defaultNetwork": {
-    "message": "ইথার লেনদেনগুলির জন্য ডিফল্ট নেটওয়ার্কটি হল মেন নেট।"
-  },
   "delete": {
     "message": "মুছুন"
   },
@@ -623,9 +617,6 @@
   "newContract": {
     "message": "নতুন কন্ট্র্যাক্ট"
   },
-  "newNetwork": {
-    "message": "নতুন নেটওয়ার্ক"
-  },
   "newPassword": {
     "message": "নতুন পাসওয়ার্ড (অন্তত 8 অক্ষরের)"
   },
@@ -674,12 +665,6 @@
   "on": {
     "message": "চালু"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "এক্সপ্লোরার URL ব্লক করুন (ঐচ্ছিক)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "প্রতীক (ঐচ্ছিক)"
-  },
   "origin": {
     "message": "উৎস"
   },
@@ -859,9 +844,6 @@
   "selectAnAccount": {
     "message": "একটি অ্যাকাউন্ট নির্বাচন করুন"
   },
-  "selectAnAccountHelp": {
-    "message": "MetaMask এ দেখতে অ্যাকাউন্টটি নির্বাচন করুন"
-  },
   "selectEachPhrase": {
     "message": "ফ্রেজগুলি সঠিক তা নিশ্চিত করতে অনুগ্রহ করে প্রতিটি ফ্রেজ নির্বাচন করুন।"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index f0c688d8d..b29188344 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -254,9 +254,6 @@
   "customGasSubTitle": {
     "message": "Augmentar la tarifa pot disminuir els temps de processament, però això no està garantit."
   },
-  "customRPC": {
-    "message": "RPC a mida"
-  },
   "customToken": {
     "message": "Fitxa a Mida"
   },
@@ -266,9 +263,6 @@
   "decimalsMustZerotoTen": {
     "message": "Els decimals han de ser al menys 0, i no més de 36."
   },
-  "defaultNetwork": {
-    "message": "La xarxa per defecte per a les transaccions Ether és Mainnet."
-  },
   "delete": {
     "message": "Suprimeix"
   },
@@ -607,9 +601,6 @@
   "newContract": {
     "message": "Nou Contracte"
   },
-  "newNetwork": {
-    "message": "Nova Xarxa"
-  },
   "newPassword": {
     "message": "Nova contrasenya (mínim 8 caràcters)"
   },
@@ -658,12 +649,6 @@
   "on": {
     "message": "Activat"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Bloqueja l'URL d'Explorer (opcional)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Símbol (opcional)"
-  },
   "origin": {
     "message": "Origen"
   },
@@ -837,9 +822,6 @@
   "selectAnAccount": {
     "message": "Selecciona un Compte"
   },
-  "selectAnAccountHelp": {
-    "message": "Selecciona el compte que vols veure a MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Si us plau selecciona cada frase per a assegurar-te que és correcta."
   },
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index 8a9be7f3a..da4fba371 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -88,9 +88,6 @@
   "customGas": {
     "message": "Nastavit palivo"
   },
-  "customRPC": {
-    "message": "Vlastní RPC"
-  },
   "customToken": {
     "message": "Vlastní token"
   },
@@ -100,9 +97,6 @@
   "decimalsMustZerotoTen": {
     "message": "Desetinných míst musí být od 0 do 36."
   },
-  "defaultNetwork": {
-    "message": "Výchozí síť pro Etherové transakce je Mainnet."
-  },
   "depositEther": {
     "message": "Vložit Ether"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 11b79bc9a..8d288c33f 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Forøgelse af gebyr kan mindske bearbejdningstiden, men det er ikke en garanti."
   },
-  "customRPC": {
-    "message": "Tilpasset RPC"
-  },
   "customToken": {
     "message": "Brugerdefineret Token"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Decimaler skal være mindst 0 og højst 36."
   },
-  "defaultNetwork": {
-    "message": "Standardnetværket for Ether-transaktioner er Mainnet."
-  },
   "delete": {
     "message": "Slet"
   },
@@ -607,9 +601,6 @@
   "newContract": {
     "message": "Ny Kontrakt"
   },
-  "newNetwork": {
-    "message": "Nyt Netværk"
-  },
   "newPassword": {
     "message": "Ny adgangskode (min. 8 tegn)"
   },
@@ -658,12 +649,6 @@
   "on": {
     "message": "Til"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blok-stifinder-URL (valgfrit)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symbol (valgfrit)"
-  },
   "parameters": {
     "message": "Parametre"
   },
@@ -840,9 +825,6 @@
   "selectAnAccount": {
     "message": "Vælg en Konto"
   },
-  "selectAnAccountHelp": {
-    "message": "Vælg kontoen der skal vises i MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Vælg venligst hver sætning, for at sikre at de er korrekte."
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index f5dd97621..bca6b887a 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -248,9 +248,6 @@
   "customGasSubTitle": {
     "message": "Höhere Gebühren können Bearbeitungszeiten verkürzen, wofür es allerdings keine Garantie gibt."
   },
-  "customRPC": {
-    "message": "Spezieller RPC"
-  },
   "customToken": {
     "message": "Custom-Token"
   },
@@ -260,9 +257,6 @@
   "decimalsMustZerotoTen": {
     "message": "Die Dezimalangabe muss mindestens 0 und nicht höher als 36 sein."
   },
-  "defaultNetwork": {
-    "message": "Das Standardnetzwerk für Ether Transaktionen ist das Mainnet."
-  },
   "delete": {
     "message": "Löschen"
   },
@@ -602,9 +596,6 @@
   "newContract": {
     "message": "Neuer Smart Contract"
   },
-  "newNetwork": {
-    "message": "Neues Netzwerk"
-  },
   "newPassword": {
     "message": "Neues Passwort (min. 8 Zeichen)"
   },
@@ -650,9 +641,6 @@
   "on": {
     "message": "An"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Block-Explorer-URL (optional)"
-  },
   "origin": {
     "message": "Ursprung"
   },
@@ -697,7 +685,7 @@
     "message": "Datenschutzrichtlinie"
   },
   "privateKeyWarning": {
-    "message": "Warnung: Niemals jemanden deinen Private Key mitteilen. Jeder der im Besitz deines Private Keys ist, kann jegliches Guthaben deines Accounts stehlen."
+    "message": "Warnung: Niemals jemandem deinen Private Key mitteilen. Jeder der im Besitz deines Private Keys ist, kann jegliches Guthaben deines Accounts stehlen."
   },
   "privateNetwork": {
     "message": "Privates Netzwerk"
@@ -828,9 +816,6 @@
   "selectAnAccount": {
     "message": "Ein Konto auswählen"
   },
-  "selectAnAccountHelp": {
-    "message": "Wählen Sie das Konto aus, das in MetaMask angezeigt werden soll."
-  },
   "selectEachPhrase": {
     "message": "Bitte wählen Sie jede Phrase aus, um sicherzustellen, dass sie korrekt ist."
   },
@@ -964,7 +949,7 @@
     "message": "Hierdurch werden ein neues Wallet und eine mnemonische Phrase erzeugt"
   },
   "tips": {
-    "message": "Trinkgelder"
+    "message": "Tipps"
   },
   "to": {
     "message": "An"
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 15071eab3..1b880074b 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -254,9 +254,6 @@
   "customGasSubTitle": {
     "message": "Η αύξηση των τελών μπορεί να μειώσει τους χρόνους επεξεργασίας, αλλά αυτό δεν είναι εγγυημένο."
   },
-  "customRPC": {
-    "message": "Προσαρμοσμένο RPC"
-  },
   "customToken": {
     "message": "Προσαρμοσμένο Token"
   },
@@ -266,9 +263,6 @@
   "decimalsMustZerotoTen": {
     "message": "Τα δεκαδικά πρέπει να είναι τουλάχιστον 0 και όχι πάνω από 36."
   },
-  "defaultNetwork": {
-    "message": "Το προεπιλεγμένο δίκτυο για συναλλαγές Ether είναι το Mainnet."
-  },
   "delete": {
     "message": "Διαγραφή"
   },
@@ -620,9 +614,6 @@
   "newContract": {
     "message": "Νέα Σύμβαση"
   },
-  "newNetwork": {
-    "message": "Νέο Δίκτυο"
-  },
   "newPassword": {
     "message": "Νέος Κωδικός Πρόσβασης (ελάχιστο 8 χαρακτήρες)"
   },
@@ -671,12 +662,6 @@
   "on": {
     "message": "Ενεργό"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Διεύθυνση URL Εξερευνητή Μπλοκ (προαιρετικό)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Σύμβολο (προαιρετικό)"
-  },
   "origin": {
     "message": "Προέλευση"
   },
@@ -856,9 +841,6 @@
   "selectAnAccount": {
     "message": "Επιλέξτε Λογαριασμό"
   },
-  "selectAnAccountHelp": {
-    "message": "Επιλέξτε τον λογαριασμό για προβολή στο MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Παρακαλούμε επιλέξτε κάθε φράση, για να βεβαιωθείτε ότι είναι σωστή."
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 8c7a3f49d..9fc4cfa44 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -43,6 +43,9 @@
   "activityLog": {
     "message": "activity log"
   },
+  "addANetwork": {
+    "message": "Add a network"
+  },
   "addAcquiredTokens": {
     "message": "Add the tokens you've acquired using MetaMask"
   },
@@ -79,6 +82,9 @@
   "addFriendsAndAddresses": {
     "message": "Add friends and addresses you trust"
   },
+  "addNFT": {
+    "message": "Add NFT"
+  },
   "addNetwork": {
     "message": "Add Network"
   },
@@ -107,7 +113,7 @@
     "message": "Advanced Options"
   },
   "advancedSettingsDescription": {
-    "message": "Access developer features, download State Logs, Reset Account, setup testnets and custom RPC"
+    "message": "Access developer features, download State Logs, Reset Account, setup test networks and custom RPC"
   },
   "affirmAgree": {
     "message": "I Agree"
@@ -139,9 +145,9 @@
   "allowExternalExtensionTo": {
     "message": "Allow this external extension to:"
   },
-  "allowOriginSpendToken": {
-    "message": "Allow $1 to spend your $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
+  "allowSpendToken": {
+    "message": "Give permission to access your $1?",
+    "description": "$1 is the symbol of the token that are requesting to spend"
   },
   "allowThisSiteTo": {
     "message": "Allow this site to:"
@@ -153,9 +159,6 @@
   "amount": {
     "message": "Amount"
   },
-  "amountWithColon": {
-    "message": "Amount:"
-  },
   "appDescription": {
     "message": "An Ethereum Wallet in your Browser",
     "description": "The description of the application"
@@ -183,6 +186,9 @@
   "approved": {
     "message": "Approved"
   },
+  "approvedAmountWithColon": {
+    "message": "Approved Amount:"
+  },
   "asset": {
     "message": "Asset"
   },
@@ -543,21 +549,28 @@
   "currentlyUnavailable": {
     "message": "Unavailable on this network"
   },
+  "custom": {
+    "message": "Advanced"
+  },
   "customGas": {
     "message": "Customize Gas"
   },
   "customGasSubTitle": {
     "message": "Increasing fee may decrease processing times, but it is not guaranteed."
   },
-  "customRPC": {
-    "message": "Custom RPC"
-  },
   "customSpendLimit": {
     "message": "Custom Spend Limit"
   },
   "customToken": {
     "message": "Custom Token"
   },
+  "dappSuggested": {
+    "message": "Site suggested"
+  },
+  "dappSuggestedTooltip": {
+    "message": "$1 has recommended this price.",
+    "description": "$1 represents the Dapp's origin"
+  },
   "data": {
     "message": "Data"
   },
@@ -591,7 +604,8 @@
     "message": "Decrypt request"
   },
   "defaultNetwork": {
-    "message": "The default network for Ether transactions is Mainnet."
+    "message": "The default network for Ether transactions is Mainnet. You can also $1 test networks $2.",
+    "description": "$1 is the 'enable' or 'disable' key, depending on whether the display of test networks is enabled or not. $2 is a clickable link with text defined by the 'here' key. The link will open to the advanced settings where users can enable the display of test networks in the network dropdown."
   },
   "delete": {
     "message": "Delete"
@@ -617,6 +631,9 @@
   "directDepositEtherExplainer": {
     "message": "If you already have some Ether, the quickest way to get Ether in your new wallet by direct deposit."
   },
+  "disable": {
+    "message": "disable"
+  },
   "disconnect": {
     "message": "Disconnect"
   },
@@ -768,6 +785,9 @@
   "editPermission": {
     "message": "Edit Permission"
   },
+  "enable": {
+    "message": "enable"
+  },
   "enableFromSettings": {
     "message": " Enable it from Settings."
   },
@@ -891,6 +911,9 @@
   "etherscanView": {
     "message": "View account on Etherscan"
   },
+  "etherscanViewOn": {
+    "message": "View on Etherscan"
+  },
   "expandView": {
     "message": "Expand view"
   },
@@ -1002,6 +1025,9 @@
   "gasPriceInfoTooltipContent": {
     "message": "Gas price specifies the amount of Ether you are willing to pay for each unit of gas."
   },
+  "gasPriceLabel": {
+    "message": "Gas price"
+  },
   "gasTimingMinutes": {
     "message": "$1 minutes",
     "description": "$1 represents a number of minutes"
@@ -1055,6 +1081,9 @@
   "goerli": {
     "message": "Goerli Test Network"
   },
+  "grantedToWithColon": {
+    "message": "Granted To:"
+  },
   "happyToSeeYou": {
     "message": "We’re happy to see you."
   },
@@ -1097,6 +1126,9 @@
   "hideZeroBalanceTokens": {
     "message": "Hide Tokens Without Balance"
   },
+  "high": {
+    "message": "Aggressive"
+  },
   "history": {
     "message": "History"
   },
@@ -1114,7 +1146,7 @@
     "message": "import using Secret Recovery Phrase"
   },
   "importAccountMsg": {
-    "message": " Imported accounts will not be associated with your originally created MetaMask account Secret Recovery Phrase. Learn more about imported accounts "
+    "message": "Imported accounts will not be associated with your originally created MetaMask account Secret Recovery Phrase. Learn more about imported accounts"
   },
   "importAccountSeedPhrase": {
     "message": "Import a wallet with Secret Recovery Phrase"
@@ -1168,6 +1200,9 @@
   "insufficientFunds": {
     "message": "Insufficient funds."
   },
+  "insufficientFundsForGas": {
+    "message": "Insufficient funds for gas"
+  },
   "insufficientTokens": {
     "message": "Insufficient tokens."
   },
@@ -1330,6 +1365,12 @@
   "lockTimeTooGreat": {
     "message": "Lock time is too great"
   },
+  "low": {
+    "message": "Low"
+  },
+  "lowPriorityMessage": {
+    "message": "Future transactions will queue after this one. This price was last seen was some time ago."
+  },
   "mainnet": {
     "message": "Ethereum Mainnet"
   },
@@ -1343,12 +1384,18 @@
   "max": {
     "message": "Max"
   },
+  "maxBaseFee": {
+    "message": "Max base fee"
+  },
   "maxFee": {
     "message": "Max fee"
   },
   "maxPriorityFee": {
     "message": "Max priority fee"
   },
+  "medium": {
+    "message": "Market"
+  },
   "memo": {
     "message": "memo"
   },
@@ -1433,6 +1480,9 @@
     "message": "verify the network details",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
   },
+  "missingNFT": {
+    "message": "Don't see your NFT?"
+  },
   "missingToken": {
     "message": "Don't see your token?"
   },
@@ -1529,8 +1579,8 @@
   "newContract": {
     "message": "New Contract"
   },
-  "newNetwork": {
-    "message": "New Network"
+  "newNetworkAdded": {
+    "message": "“$1” was successfully added!"
   },
   "newPassword": {
     "message": "New password (min 8 chars)"
@@ -1551,6 +1601,9 @@
     "message": "Nonce is higher than suggested nonce of $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
+  "nfts": {
+    "message": "NFTs"
+  },
   "noAccountsFound": {
     "message": "No accounts found for the given search query"
   },
@@ -1563,6 +1616,9 @@
   "noConversionRateAvailable": {
     "message": "No Conversion Rate Available"
   },
+  "noNFTs": {
+    "message": "No NFTs yet"
+  },
   "noThanks": {
     "message": "No Thanks"
   },
@@ -1755,11 +1811,8 @@
   "optional": {
     "message": "Optional"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Block Explorer URL (optional)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Currency Symbol (optional)"
+  "optionalWithParanthesis": {
+    "message": "(Optional)"
   },
   "or": {
     "message": "or"
@@ -1801,6 +1854,9 @@
   "permissionCheckedIconDescription": {
     "message": "You have approved this permission"
   },
+  "permissionRequest": {
+    "message": "Permission Request"
+  },
   "permissionUncheckedIconDescription": {
     "message": "You have not approved this permission"
   },
@@ -2108,13 +2164,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "This account has already been connected to MetaMask"
   },
-  "selectAnAccountHelp": {
-    "message": "Select an account to view in MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "Don't see your account? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Please select each phrase in order to make sure it is correct."
   },
@@ -2122,7 +2171,7 @@
     "message": "Select HD Path"
   },
   "selectPathHelp": {
-    "message": "If you don't see your existing Ledger accounts below, try switching paths to \"Legacy (MEW / MyCrypto)\""
+    "message": "If you don't see the accounts you expect, try switching the HD path."
   },
   "selectType": {
     "message": "Select Type"
@@ -2172,10 +2221,10 @@
     "message": "Select this to show gas price and limit controls directly on the send and confirm screens."
   },
   "showFiatConversionInTestnets": {
-    "message": "Show Conversion on Testnets"
+    "message": "Show Conversion on test networks"
   },
   "showFiatConversionInTestnetsDescription": {
-    "message": "Select this to show fiat conversion on Testnets"
+    "message": "Select this to show fiat conversion on test networks"
   },
   "showHexData": {
     "message": "Show Hex Data"
@@ -2201,6 +2250,12 @@
   "showSeedPhrase": {
     "message": "Show Secret Recovery Phrase"
   },
+  "showTestnetNetworks": {
+    "message": "Show test networks"
+  },
+  "showTestnetNetworksDescription": {
+    "message": "Select this to show test networks in network list"
+  },
   "sigRequest": {
     "message": "Signature Request"
   },
@@ -2289,6 +2344,13 @@
   "statusNotConnected": {
     "message": "Not connected"
   },
+  "step1LatticeWallet": {
+    "message": "Make sure your Lattice1 is ready to connect"
+  },
+  "step1LatticeWalletMsg": {
+    "message": "You can connect MetaMask to your Lattice1 device once it is set up and online. Unlock your device and have your Device ID ready. For more on using hardware wallets, $1",
+    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
+  },
   "step1LedgerWallet": {
     "message": "Download Ledger app"
   },
@@ -2652,12 +2714,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "Allow this site to switch the network?"
   },
-  "switchLedgerPaths": {
-    "message": "Switch Ledger paths"
-  },
-  "switchLedgerPathsText": {
-    "message": "Select the Ledger path to view other accounts"
-  },
   "switchNetwork": {
     "message": "Switch network"
   },
@@ -2734,9 +2790,6 @@
     "message": "To: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "To:"
-  },
   "token": {
     "message": "Token"
   },
@@ -2785,6 +2838,12 @@
   "transactionDetailGasHeading": {
     "message": "Estimated gas fee"
   },
+  "transactionDetailGasHeadingV2": {
+    "message": "Gas"
+  },
+  "transactionDetailGasInfoV2": {
+    "message": "estimated"
+  },
   "transactionDetailGasTooltipConversion": {
     "message": "Learn more about gas fees"
   },
@@ -2866,14 +2925,13 @@
     "description": "Followed by a link (here) to view token balances"
   },
   "trustSiteApprovePermission": {
-    "message": "Do you trust this site? By granting this permission, you’re allowing $1 to withdraw your $2 and automate transactions for you.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
+    "message": "By granting permission, you are allowing the following $1 to access your funds"
   },
   "tryAgain": {
     "message": "Try again"
   },
   "turnOnTokenDetection": {
-    "message": "Turn on Token Detection"
+    "message": "Turn on enhanced token detection"
   },
   "typePassword": {
     "message": "Type your MetaMask password"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 63d07557d..8418ba8e6 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "Permitir que esta extensión externa haga lo siguiente:"
   },
-  "allowOriginSpendToken": {
-    "message": "¿Permitir que $1 gaste su $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Permitir que este sitio haga lo siguiente:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "Importe"
   },
-  "amountWithColon": {
-    "message": "Importe:"
-  },
   "appDescription": {
     "message": "Una cartera de Ethereum en el explorador",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "Aumentar la cuota puede disminuir los tiempos de procesamiento, pero no está garantizado."
   },
-  "customRPC": {
-    "message": "RPC personalizada"
-  },
   "customSpendLimit": {
     "message": "Límite de gastos personalizado"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "Descifrar solicitud"
   },
-  "defaultNetwork": {
-    "message": "La red predeterminada para las transacciones de ether es la red principal."
-  },
   "delete": {
     "message": "Eliminar"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "Contrato nuevo"
   },
-  "newNetwork": {
-    "message": "Red nueva"
-  },
   "newPassword": {
     "message": "Contraseña nueva (mín. de 8 caracteres)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "Conéctese solo con sitios de confianza."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Dirección URL del explorador de bloques (opcional)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Símbolo de moneda (opcional)"
-  },
   "origin": {
     "message": "Origen"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "Esta cuenta ya se conectó a MetaMask."
   },
-  "selectAnAccountHelp": {
-    "message": "Seleccione una cuenta para verla en MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "¿No ve su cuenta? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Seleccione cada frase para garantizar que sea correcta."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "¿Le permite a este sitio cambiar la red?"
   },
-  "switchLedgerPaths": {
-    "message": "Cambiar rutas de acceso al Ledger"
-  },
-  "switchLedgerPathsText": {
-    "message": "Seleccione la ruta de acceso al Ledger para ver otras cuentas"
-  },
   "switchNetwork": {
     "message": "Cambiar red"
   },
@@ -2201,9 +2166,6 @@
     "message": "Para: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Para:"
-  },
   "token": {
     "message": "Token"
   },
@@ -2281,10 +2243,6 @@
     "message": "Tuvimos problemas al cargar los saldos de token. Puede verlos ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "¿Este sitio es de confianza? Al conceder este permiso, autoriza que $1 retire su $2 y automatice las transacciones por usted.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Vuelva a intentarlo"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 63d07557d..8418ba8e6 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "Permitir que esta extensión externa haga lo siguiente:"
   },
-  "allowOriginSpendToken": {
-    "message": "¿Permitir que $1 gaste su $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Permitir que este sitio haga lo siguiente:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "Importe"
   },
-  "amountWithColon": {
-    "message": "Importe:"
-  },
   "appDescription": {
     "message": "Una cartera de Ethereum en el explorador",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "Aumentar la cuota puede disminuir los tiempos de procesamiento, pero no está garantizado."
   },
-  "customRPC": {
-    "message": "RPC personalizada"
-  },
   "customSpendLimit": {
     "message": "Límite de gastos personalizado"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "Descifrar solicitud"
   },
-  "defaultNetwork": {
-    "message": "La red predeterminada para las transacciones de ether es la red principal."
-  },
   "delete": {
     "message": "Eliminar"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "Contrato nuevo"
   },
-  "newNetwork": {
-    "message": "Red nueva"
-  },
   "newPassword": {
     "message": "Contraseña nueva (mín. de 8 caracteres)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "Conéctese solo con sitios de confianza."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Dirección URL del explorador de bloques (opcional)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Símbolo de moneda (opcional)"
-  },
   "origin": {
     "message": "Origen"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "Esta cuenta ya se conectó a MetaMask."
   },
-  "selectAnAccountHelp": {
-    "message": "Seleccione una cuenta para verla en MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "¿No ve su cuenta? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Seleccione cada frase para garantizar que sea correcta."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "¿Le permite a este sitio cambiar la red?"
   },
-  "switchLedgerPaths": {
-    "message": "Cambiar rutas de acceso al Ledger"
-  },
-  "switchLedgerPathsText": {
-    "message": "Seleccione la ruta de acceso al Ledger para ver otras cuentas"
-  },
   "switchNetwork": {
     "message": "Cambiar red"
   },
@@ -2201,9 +2166,6 @@
     "message": "Para: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Para:"
-  },
   "token": {
     "message": "Token"
   },
@@ -2281,10 +2243,6 @@
     "message": "Tuvimos problemas al cargar los saldos de token. Puede verlos ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "¿Este sitio es de confianza? Al conceder este permiso, autoriza que $1 retire su $2 y automatice las transacciones por usted.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Vuelva a intentarlo"
   },
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index de6d85299..66ce15ec5 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Tasu suurendamine võib töötlemisaegu vähendada, kuid see ei ole tagatud."
   },
-  "customRPC": {
-    "message": "Kohandatud RPC"
-  },
   "customToken": {
     "message": "Kohandatud luba"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Kümnendkohad peavad olema vähemalt 0 ja mitte üle 36."
   },
-  "defaultNetwork": {
-    "message": "Etheri tehingute vaikevõrk on peavõrk."
-  },
   "delete": {
     "message": "Kustuta"
   },
@@ -613,9 +607,6 @@
   "newContract": {
     "message": "Uus kontakt"
   },
-  "newNetwork": {
-    "message": "Uus võrk"
-  },
   "newPassword": {
     "message": "Uus parool (vähemalt 8 tähemärki)"
   },
@@ -664,12 +655,6 @@
   "on": {
     "message": "Sees"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blokeeri Exploreri URL (valikuline)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Sümbol (valikuline)"
-  },
   "origin": {
     "message": "Päritolu"
   },
@@ -849,9 +834,6 @@
   "selectAnAccount": {
     "message": "Valige konto"
   },
-  "selectAnAccountHelp": {
-    "message": "Valige konto, mida MetaMaskis vaadata"
-  },
   "selectEachPhrase": {
     "message": "Valige iga fraas, veendumaks, et see on õige."
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index b22b198c5..f6fd7e476 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "اضافه نمودن فیس ممکن زمان پروسس را کاهش دهد، اما تضمین نمیشود."
   },
-  "customRPC": {
-    "message": "RPC رایج"
-  },
   "customToken": {
     "message": "رمزیاب دلخواه"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "اعشاریه ها باید حد اقل 0، و بیشتر از 36 نباشند."
   },
-  "defaultNetwork": {
-    "message": "شبکه خودکار برای معاملات Ether عبارت است از Mainnet."
-  },
   "delete": {
     "message": "حذف"
   },
@@ -623,9 +617,6 @@
   "newContract": {
     "message": "قرارداد جدید"
   },
-  "newNetwork": {
-    "message": "شبکه جدید"
-  },
   "newPassword": {
     "message": "رمز عبور جدید (حداقل 8 حرف)"
   },
@@ -674,12 +665,6 @@
   "on": {
     "message": "روشن"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "بلاک کردن مرورگر URL (انتخابی)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "سمبول (انتخابی)"
-  },
   "origin": {
     "message": "مبدأ"
   },
@@ -859,9 +844,6 @@
   "selectAnAccount": {
     "message": "یک حساب را انتخاب کنید"
   },
-  "selectAnAccountHelp": {
-    "message": "برای مشاهده MetaMask حساب را انتخاب نمایید"
-  },
   "selectEachPhrase": {
     "message": "لطفًا جهت اطمینان از درستی، هر عبارت را انتخاب کنید."
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 857e496e2..8260f9ad4 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Taksan korottaminen saattaa vähentää käsittelyaikaa, mutta siitä ei anneta takeita."
   },
-  "customRPC": {
-    "message": "Mukautettu RPC"
-  },
   "customToken": {
     "message": "Mukautettu tietue"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Desimaalien on oltava vähintään 0 ja korkeintaan 36."
   },
-  "defaultNetwork": {
-    "message": "Oletusverkko Ether-tapahtumille on Mainnet."
-  },
   "delete": {
     "message": "Poista"
   },
@@ -623,9 +617,6 @@
   "newContract": {
     "message": "Uusi sopimus"
   },
-  "newNetwork": {
-    "message": "Uusi verkko"
-  },
   "newPassword": {
     "message": "Uusi salasana (väh. 8 merkkiä)"
   },
@@ -671,12 +662,6 @@
   "on": {
     "message": "Käytössä"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Estä Explorerin URL-osoite (valinnainen)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symboli (valinnainen)"
-  },
   "origin": {
     "message": "Alkuperä"
   },
@@ -856,9 +841,6 @@
   "selectAnAccount": {
     "message": "Valitse tili"
   },
-  "selectAnAccountHelp": {
-    "message": "Valitse MetaMaskissa näytettävä tili"
-  },
   "selectEachPhrase": {
     "message": "Ole hyvä ja valitse jokainen teksti järjestyksessä varmistaaksesi, että se on oikein."
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 235694a2f..23001c136 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -245,9 +245,6 @@
   "decimalsMustZerotoTen": {
     "message": "Ang mga decimal ay hindi dapat bumaba sa 0, at hindi lumampas sa 36."
   },
-  "defaultNetwork": {
-    "message": "Ang default na network para sa mga transaksyon ng Ether ay Mainnet."
-  },
   "delete": {
     "message": "I-delete"
   },
@@ -557,9 +554,6 @@
   "newContract": {
     "message": "Bagong Contract"
   },
-  "newNetwork": {
-    "message": "Bagong Network"
-  },
   "newPassword": {
     "message": "Bagong Password (min 8 char)"
   },
@@ -605,12 +599,6 @@
   "on": {
     "message": "Naka-on"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Block Explorer URL (opsyonal)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbolo (opsyonal)"
-  },
   "origin": {
     "message": "Pinanggalingan"
   },
@@ -777,9 +765,6 @@
   "selectAnAccount": {
     "message": "Pumili ng Account"
   },
-  "selectAnAccountHelp": {
-    "message": "Piliin ang account na titingnan sa MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Pakipili ang bawat parirala para tiyaking tama ito."
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 709ecbd83..7ed3dbcdd 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -248,9 +248,6 @@
   "customGasSubTitle": {
     "message": "Augmenter le tarif peut faire baisser le temps de traitement, mais cela n'est pas garanti."
   },
-  "customRPC": {
-    "message": "RPC personnalisé"
-  },
   "customToken": {
     "message": "Jeton personnalisé"
   },
@@ -260,9 +257,6 @@
   "decimalsMustZerotoTen": {
     "message": "Les décimales doivent être plus grandes que 0 et inférieures à 36."
   },
-  "defaultNetwork": {
-    "message": "Le réseau par défaut pour les transactions Ether est le \"Réseau principal Ethereum\"."
-  },
   "delete": {
     "message": "Supprimer"
   },
@@ -608,9 +602,6 @@
   "newContract": {
     "message": "Nouveau contrat"
   },
-  "newNetwork": {
-    "message": "Nouveau réseau"
-  },
   "newPassword": {
     "message": "Nouveau mot de passe (min 8 caractères)"
   },
@@ -656,12 +647,6 @@
   "on": {
     "message": "Activé"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL de l'explorateur de blocs (facultatif)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symbole (facultatif)"
-  },
   "origin": {
     "message": "Origine"
   },
@@ -841,9 +826,6 @@
   "selectAnAccount": {
     "message": "Selectionner un compte"
   },
-  "selectAnAccountHelp": {
-    "message": "Selectionner le compte à afficher dans MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Veuillez sélectionner chaque phrase afin de vous assurer qu'elle est correcte."
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index f080f1e66..905020755 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "הגדלת התשלום עשויה לצמצם את זמני העיבוד, אבל אין ערובה לכך."
   },
-  "customRPC": {
-    "message": "RPC מותאם אישית"
-  },
   "customToken": {
     "message": "אסימון מותאם אישית"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "מספרים עשרוניים חייבים להיות לפחות 0 ולא מעל 36."
   },
-  "defaultNetwork": {
-    "message": "רשת ברירת המחדל לעסקאות Ether היא Mainnet."
-  },
   "delete": {
     "message": "מחיקה"
   },
@@ -620,9 +614,6 @@
   "newContract": {
     "message": "חוזה חדש"
   },
-  "newNetwork": {
-    "message": "רשת חדשה"
-  },
   "newPassword": {
     "message": "ססמה חדשה (לפחות 8 תווים)"
   },
@@ -671,12 +662,6 @@
   "on": {
     "message": "פועל"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "חסום כתובת URL של אקספלורר (אופציונלי)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "סמל (אופציונלי)"
-  },
   "origin": {
     "message": "מקור"
   },
@@ -853,9 +838,6 @@
   "selectAnAccount": {
     "message": "בחר חשבון"
   },
-  "selectAnAccountHelp": {
-    "message": "בחר את החשבון לצפייה ב- MetaMask"
-  },
   "selectEachPhrase": {
     "message": "נא לבחור כל צירוף מילים כדי להבטיח שהוא נכון."
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 217bdeca4..65f6640c1 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "इस बाहरी एक्सटेंशन को इसकी अनुमति दें:"
   },
-  "allowOriginSpendToken": {
-    "message": "$1 को आपका $2 खर्च करने की अनुमति दें?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "इस साइट को इसकी अनुमति दें:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "राशि"
   },
-  "amountWithColon": {
-    "message": "राशि:"
-  },
   "appDescription": {
     "message": "आपके ब्राउज़र में एक Ethereum वॉलेट",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "शुल्क बढ़ाने से प्रसंस्करण समय में कमी हो सकती है, लेकिन इसकी गारंटी नहीं होती है।"
   },
-  "customRPC": {
-    "message": "कस्टम RPC"
-  },
   "customSpendLimit": {
     "message": "कस्टम खर्च सीमा"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "अनुरोध डिक्रिप्ट करें"
   },
-  "defaultNetwork": {
-    "message": "Ether के लेनदेन के लिए डिफ़ॉल्ट नेटवर्क Mainnet है।"
-  },
   "delete": {
     "message": "हटाएँ"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "नया अनुबंध"
   },
-  "newNetwork": {
-    "message": "नया नेटवर्क"
-  },
   "newPassword": {
     "message": "नया पासवर्ड (न्यूनतम 8 वर्ण)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "केवल उन साइटों से कनेक्ट करें, जिन पर आप भरोसा करते हैं।"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "ब्लॉक एक्सप्लोरर URL (वैकल्पिक)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "मुद्रा प्रतीक (वैकल्पिक)"
-  },
   "origin": {
     "message": "उत्पत्ति"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "यह खाता पहले ही MetaMask से जुड़ा हुआ है"
   },
-  "selectAnAccountHelp": {
-    "message": "MetaMask में देखने के लिए खाते का चयन करें।"
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "अपना खाता नहीं देख पा रहे हैं? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "कृपया प्रत्येक वाक्यांश का चयन करें, ताकि यह सुनिश्चित हो सके कि यह सही है।"
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "इस साइट को नेटवर्क स्विच करने की अनुमति दें?"
   },
-  "switchLedgerPaths": {
-    "message": "Ledger पथ स्विच करें"
-  },
-  "switchLedgerPathsText": {
-    "message": "अन्य खाते देखने के लिए Ledger पथ का चयन करें"
-  },
   "switchNetwork": {
     "message": "नेटवर्क स्विच करें"
   },
@@ -2201,9 +2166,6 @@
     "message": "प्रति: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "प्रति:"
-  },
   "token": {
     "message": "टोकन"
   },
@@ -2281,10 +2243,6 @@
     "message": "हमें आपके टोकन की शेषराशि लोड करने में परेशानी हुई। आप उन्हें देख सकते हैं ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "क्या आप इस साइट पर भरोसा करते हैं? यह अनुमति देकर, आप $1 को अपने $2 की निकासी करने और आपके लिए लेनदेनों को स्वचालित करने की अनुमति दे रहे हैं।",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "पुनः प्रयास करें"
   },
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
index 73056bb06..e42222336 100644
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@@ -70,18 +70,12 @@
   "customGas": {
     "message": "अनुकूलित करें गैस"
   },
-  "customRPC": {
-    "message": "कस्टम RPC"
-  },
   "decimal": {
     "message": "दशमलव परिशुद्धता"
   },
   "decimalsMustZerotoTen": {
     "message": "दशमलव कम से कम 0 होनी चाहिए, और 36 से अधिक नहीं होनी चाहिए।"
   },
-  "defaultNetwork": {
-    "message": "ईथर लेनदेन के लिए डिफ़ॉल्ट नेटवर्क मुख्य नेट है।"
-  },
   "depositEther": {
     "message": "जमा - Ether"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index 5a629159f..7a3a94c8f 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Povećavanjem se naknade može smanjiti vrijeme obrade, ali se ne jamči."
   },
-  "customRPC": {
-    "message": "Prilagođeni RPC"
-  },
   "customToken": {
     "message": "Prilagođeni token"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Decimalni brojevni ne smiju biti 0 i ne smiju prekoračivati 36."
   },
-  "defaultNetwork": {
-    "message": "Zadana je mreža za transakcije Ether glavna mreža."
-  },
   "delete": {
     "message": "Izbriši"
   },
@@ -616,9 +610,6 @@
   "newContract": {
     "message": "Novi ugovor"
   },
-  "newNetwork": {
-    "message": "Nova mreža"
-  },
   "newPassword": {
     "message": "Nova lozinka (najmanje osam znakova)"
   },
@@ -667,12 +658,6 @@
   "on": {
     "message": "Uključi"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blokiraj Explorerov URL (neobavezno)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbol (neobavezno)"
-  },
   "origin": {
     "message": "Podrijetlo"
   },
@@ -852,9 +837,6 @@
   "selectAnAccount": {
     "message": "Odaberi račun"
   },
-  "selectAnAccountHelp": {
-    "message": "Odaberi račun za prikaz u usluzi MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Odaberite svaku rečenicu kako biste provjerili je li točna."
   },
diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
index dc3b8b90c..8013372c1 100644
--- a/app/_locales/ht/messages.json
+++ b/app/_locales/ht/messages.json
@@ -136,9 +136,6 @@
   "customGas": {
     "message": "Koutim Gaz"
   },
-  "customRPC": {
-    "message": "Koutim RPC"
-  },
   "customToken": {
     "message": "Koutim Token"
   },
@@ -148,9 +145,6 @@
   "decimalsMustZerotoTen": {
     "message": "Desimal yo dwe omwen 0, epi pa dwe plis pase 36."
   },
-  "defaultNetwork": {
-    "message": "Dfo rezo a pou tranzaksyon Ether se Mainnet."
-  },
   "depositEther": {
     "message": "Depo Ether"
   },
@@ -531,9 +525,6 @@
   "selectAnAccount": {
     "message": "Chwazi yon kont"
   },
-  "selectAnAccountHelp": {
-    "message": "Chwazi kont pou wè nan MetaMask"
-  },
   "selectHdPath": {
     "message": "Chwazi chemen HD"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 4f99006d6..18f2cf317 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "A díj növelése csökkentheti a feldolgozási időt, de ez nem garantált."
   },
-  "customRPC": {
-    "message": "Egyedi RPC"
-  },
   "customToken": {
     "message": "Egyéni token"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "A tizedesjegyek száma 0 és 36 között legyen . "
   },
-  "defaultNetwork": {
-    "message": "Az Ether tranzakciók alapértelmezett hálózata a Mainnet."
-  },
   "delete": {
     "message": "Törlés"
   },
@@ -616,9 +610,6 @@
   "newContract": {
     "message": "Új szerződés"
   },
-  "newNetwork": {
-    "message": "Új hálózat"
-  },
   "newPassword": {
     "message": "Új jelszó (minimum 8 karakter)"
   },
@@ -667,12 +658,6 @@
   "on": {
     "message": "Be"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Explorer URL letiltása (nem kötelező)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Szimbólum (opcionális)"
-  },
   "origin": {
     "message": "Eredet"
   },
@@ -852,9 +837,6 @@
   "selectAnAccount": {
     "message": "Válasszon fiókot"
   },
-  "selectAnAccountHelp": {
-    "message": "Válássza ki a MetaMask-ban megtekinteni kívánt fiókot"
-  },
   "selectEachPhrase": {
     "message": "Kérjük, válassza ki az egyes mondatokat, hogy meggyőződjön azok helyességéről. "
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 915ebf125..9f0744379 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "Izinkan ekstensi eksternal ini untuk:"
   },
-  "allowOriginSpendToken": {
-    "message": "Izinkan $1 untuk menggunakan $2 Anda?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Izinkan situs ini untuk:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "Jumlah"
   },
-  "amountWithColon": {
-    "message": "Jumlah:"
-  },
   "appDescription": {
     "message": "Dompet Ethereum di Browser Anda",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "Menaikkan biaya dapat mengurangi waktu pemrosesan, namun tidak dijamin."
   },
-  "customRPC": {
-    "message": "RPC Kustom"
-  },
   "customSpendLimit": {
     "message": "Batas Penggunaan Kustom"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "Dekrip permintaan"
   },
-  "defaultNetwork": {
-    "message": "Jaringan default untuk transaksi Ether adalah Jaringan Utama."
-  },
   "delete": {
     "message": "Hapus"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "Kontrak Baru"
   },
-  "newNetwork": {
-    "message": "Jaringan Baru"
-  },
   "newPassword": {
     "message": "Kata sandi baru (min. 8 karakter)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "Hanya hubungkan ke situs yang Anda percayai."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL Block Explorer (opsional)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbol Mata Uang (opsional)"
-  },
   "origin": {
     "message": "Asal"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "Akun ini sudah terhubung ke MetaMask."
   },
-  "selectAnAccountHelp": {
-    "message": "Pilih akun untuk dilihat di MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "Tidak melihat akun Anda? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Pilih masing-masing frasa untuk memastikan kebenarannya."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "Izinkan situs ini untuk beralih jaringan?"
   },
-  "switchLedgerPaths": {
-    "message": "Beralih jalur Ledger"
-  },
-  "switchLedgerPathsText": {
-    "message": "Pilih jalur Ledger untuk melihat akun lain"
-  },
   "switchNetwork": {
     "message": "Beralih jaringan"
   },
@@ -2201,9 +2166,6 @@
     "message": "Untuk: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Untuk:"
-  },
   "token": {
     "message": "Token"
   },
@@ -2281,10 +2243,6 @@
     "message": "Kami mengalami masalah saat memuat saldo token Anda. Anda dapat melihatnya ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "Anda percaya situs ini? Dengan memberikan izin ini, Anda mengizinkan $1 untuk menarik $2 Anda dan mengotomatiskan transaksi untuk Anda.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Coba lagi"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 0cd8bf51c..1e8c000de 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -103,10 +103,6 @@
   "allowExternalExtensionTo": {
     "message": "Permetti a questa estensione di:"
   },
-  "allowOriginSpendToken": {
-    "message": "Vuoi consentire a $1 di spendere $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Permetti a questo sito di:"
   },
@@ -117,9 +113,6 @@
   "amount": {
     "message": "Importo"
   },
-  "amountWithColon": {
-    "message": "Importo:"
-  },
   "appDescription": {
     "message": "Ethereum Browser Extension",
     "description": "The description of the application"
@@ -408,9 +401,6 @@
   "customGasSubTitle": {
     "message": "Incrementare il costo potrebbe diminuire il tempo di elaborazione, ma non è garantito."
   },
-  "customRPC": {
-    "message": "RPC Personalizzata"
-  },
   "customSpendLimit": {
     "message": "Limite Spesa Personalizzato"
   },
@@ -446,9 +436,6 @@
   "decryptRequest": {
     "message": "Decifra richiesta"
   },
-  "defaultNetwork": {
-    "message": "La rete predefinita per transazioni in Ether è la Rete Ethereum Principale."
-  },
   "delete": {
     "message": "Elimina"
   },
@@ -1007,9 +994,6 @@
   "newContract": {
     "message": "Nuovo Contratto"
   },
-  "newNetwork": {
-    "message": "Nuova Rete"
-  },
   "newPassword": {
     "message": "Nuova Password (minimo 8 caratteri)"
   },
@@ -1093,12 +1077,6 @@
   "onlyConnectTrust": {
     "message": "Connettiti solo con siti di cui ti fidi."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL del Block Explorer (opzionale)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbolo (opzionale)"
-  },
   "origin": {
     "message": "Origine"
   },
@@ -1328,9 +1306,6 @@
   "selectAnAccount": {
     "message": "Seleziona un Account"
   },
-  "selectAnAccountHelp": {
-    "message": "Selezione l'account da visualizzare in MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Per favore seleziona ogni frase in ordine per assicurarti che sia corretta."
   },
@@ -1793,9 +1768,6 @@
     "message": "A: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "To:"
-  },
   "token": {
     "message": "Token"
   },
@@ -1867,10 +1839,6 @@
     "message": "Abbiamo avuto un problema a caricare il bilancio dei tuoi token. Puoi vederlo ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "Ti fidi di questo sito? Autorizzandolo, stai consentendo a $1 di ritirare i tuoi $2 e automatizzare transazioni per te.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Prova di nuovo"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index a3af48c46..cea2eda8c 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "この外部拡張機能に次の操作を許可します"
   },
-  "allowOriginSpendToken": {
-    "message": "$1 に $2 の使用を許可しますか?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "このサイトに次の操作を許可します"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "金額"
   },
-  "amountWithColon": {
-    "message": "金額:"
-  },
   "appDescription": {
     "message": "ブラウザーにあるイーサリアム ウォレット",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "手数料を増やすと処理時間は減少する可能性がありますが、減少しない場合もあります。"
   },
-  "customRPC": {
-    "message": "カスタム RPC"
-  },
   "customSpendLimit": {
     "message": "カスタム使用限度額"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "リクエストの復号"
   },
-  "defaultNetwork": {
-    "message": "Ether 取引のためのデフォルトのネットワークはメインネットです。"
-  },
   "delete": {
     "message": "削除"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "新しいコントラクト"
   },
-  "newNetwork": {
-    "message": "新しいネットワーク"
-  },
   "newPassword": {
     "message": "新しいパスワード (最低 8 文字)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "信頼するサイトにのみ接続します。"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "ブロック エクスプローラーの URL (オプション)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "通貨記号 (オプション)"
-  },
   "origin": {
     "message": "起点"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "このアカウントはすでに MetaMask に接続されています"
   },
-  "selectAnAccountHelp": {
-    "message": "MetaMask で表示するアカウントを選択します。"
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "アカウントが表示されません。$1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "各フレーズを選択して、各フレーズが正しいことを確認してください。"
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "このサイトのネットワーク変更を許可しますか？"
   },
-  "switchLedgerPaths": {
-    "message": "レジャー パスの切り替え"
-  },
-  "switchLedgerPathsText": {
-    "message": "レジャー パスを選択して他のアカウントを表示します"
-  },
   "switchNetwork": {
     "message": "ネットワークの切り替え"
   },
@@ -2201,9 +2166,6 @@
     "message": "移動先:$1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "移動先:"
-  },
   "token": {
     "message": "トークン"
   },
@@ -2281,10 +2243,6 @@
     "message": "トークン バランスのロードに問題があります。トークン バランスを表示できます",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "このサイトを信頼しますか?許可を与えることにより、$1 は $2 を取り消して、トランザクションを自動化できます。",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "再試行"
   },
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 0cdbcab35..bf17d9ce0 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "ಹೆಚ್ಚುತ್ತಿರುವ ಶುಲ್ಕವು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸುವ ಸಮಯದಲ್ಲಿ ಕಡಿಮೆಯಾಗುತ್ತದೆ ಆದರೆ ಇದು ಖಚಿತವಾಗಿಲ್ಲ."
   },
-  "customRPC": {
-    "message": "ಕಸ್ಟಮ್ RPC"
-  },
   "customToken": {
     "message": "ಕಸ್ಟಮ್ ಟೋಕನ್"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "ದಶಮಾಂಶಗಳು ಕನಿಷ್ಟ 0 ಆಗಿರಬೇಕು ಮತ್ತು 36 ಕ್ಕಿಂತ ಹೆಚ್ಚಿರಬಾರದು"
   },
-  "defaultNetwork": {
-    "message": "ಎಥರ್ ವಹಿವಾಟುಗಳಿಗಾಗಿ ಡೀಫಾಲ್ಟ್ ನೆಟ್‌ವರ್ಕ್ ಪ್ರಮುಖವಾಗಿರುವ ನೆಟ್ ಆಗಿದೆ."
-  },
   "delete": {
     "message": "ಅಳಿಸಿ"
   },
@@ -623,9 +617,6 @@
   "newContract": {
     "message": "ಹೊಸ ಒಪ್ಪಂದ"
   },
-  "newNetwork": {
-    "message": "ಹೊಸ ನೆಟ್‌ವರ್ಕ್"
-  },
   "newPassword": {
     "message": "ಹೊಸ ಪಾಸ್‌ವರ್ಡ್ (ಕನಿಷ್ಟ 8 ಅಕ್ಷರಗಳು)"
   },
@@ -674,12 +665,6 @@
   "on": {
     "message": "ಆನ್‌"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "ಅನ್ವೇಷಕ URL ಅನ್ನು ನಿರ್ಬಂಧಿಸಿ (ಐಚ್ಛಿಕ)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "ಚಿಹ್ನೆ (ಐಚ್ಛಿಕ)"
-  },
   "origin": {
     "message": "ಮೂಲ"
   },
@@ -859,9 +844,6 @@
   "selectAnAccount": {
     "message": "ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"
   },
-  "selectAnAccountHelp": {
-    "message": "MetaMask ನಲ್ಲಿ ವೀಕ್ಷಿಸಲು ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"
-  },
   "selectEachPhrase": {
     "message": "ಅದು ಸರಿಯಾಗಿದೆಯೆ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು ದಯವಿಟ್ಟು ಪ್ರತಿ ಫ್ರೇಸ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ."
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 9ba61d76e..f4c30767d 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "이 외부 확장을 통해 다음을 하도록 허용:"
   },
-  "allowOriginSpendToken": {
-    "message": "$1에서 $2을(를) 지출하도록 허용하시겠어요?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "이 사이트에서 다음을 하도록 허용:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "금액"
   },
-  "amountWithColon": {
-    "message": "금액:"
-  },
   "appDescription": {
     "message": "브라우저의 이더리움 지갑",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "수수료를 올리면 처리 시간이 단축되기도 하지만 항상 그렇지는 않습니다."
   },
-  "customRPC": {
-    "message": "맞춤형 RPC"
-  },
   "customSpendLimit": {
     "message": "맞춤형 지출 한도"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "요청 암호 해독"
   },
-  "defaultNetwork": {
-    "message": "Ether 거래의 기본 네트워크는 메인 넷입니다."
-  },
   "delete": {
     "message": "삭제"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "새 계약"
   },
-  "newNetwork": {
-    "message": "새 네트워크"
-  },
   "newPassword": {
     "message": "새 암호(8자 이상)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "신뢰하는 사이트만 연결하세요."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "블록 탐색기 URL(선택 사항)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "통화 기호(선택 사항)"
-  },
   "origin": {
     "message": "원본"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "이 계정은 이미 MetaMask와 연결되어 있습니다."
   },
-  "selectAnAccountHelp": {
-    "message": "MetaMask에서 확인할 계정을 선택하십시오."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "계정을 찾을 수 없습니까? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "각 구문을 선택하여 구문이 올바른지 확인하세요."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "이 사이트가 네트워크를 전환하도록 허용하시겠어요?"
   },
-  "switchLedgerPaths": {
-    "message": "Ledger 경로 전환"
-  },
-  "switchLedgerPathsText": {
-    "message": "다른 계정을 보려면 Ledger 경로를 선택하세요."
-  },
   "switchNetwork": {
     "message": "네트워크 전환"
   },
@@ -2201,9 +2166,6 @@
     "message": "수신: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "수신:"
-  },
   "token": {
     "message": "토큰"
   },
@@ -2281,10 +2243,6 @@
     "message": "토큰 잔액을 로드하는 도중 문제가 발생했습니다. 다음에서 잔액을 확인하세요. ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "이 사이트를 신뢰하시나요? 이 권한을 부여하면 $1에서 귀하의 $2을(를) 인출하고 거래를 자동으로 처리하게 됩니다.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "다시 시도"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index 01670c783..80536f454 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Didinant mokestį gali mažėti apdorojimo trukmė, bet tai negarantuojama."
   },
-  "customRPC": {
-    "message": "Pritaikytas RPC"
-  },
   "customToken": {
     "message": "Pritaikytas žetonas"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Turi būti bent 0 skaitmenų po kablelio, bet ne daugiau kaip 36."
   },
-  "defaultNetwork": {
-    "message": "Numatytasis „Ether“ operacijų tinklas yra pagrindinis tinklas."
-  },
   "delete": {
     "message": "Ištrinti"
   },
@@ -623,9 +617,6 @@
   "newContract": {
     "message": "Nauja sutartis"
   },
-  "newNetwork": {
-    "message": "Naujas tinklas"
-  },
   "newPassword": {
     "message": "Naujas slaptažodis (bent 8 ženklai)"
   },
@@ -674,12 +665,6 @@
   "on": {
     "message": "Įjungta"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blokuoti naršyklės URL (pasirinktinai)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbolis (nebūtinas)"
-  },
   "origin": {
     "message": "Kilmė"
   },
@@ -859,9 +844,6 @@
   "selectAnAccount": {
     "message": "Pasirinkite paskyrą"
   },
-  "selectAnAccountHelp": {
-    "message": "Pasirinkite paskyrą peržiūrėti „MetaMask“"
-  },
   "selectEachPhrase": {
     "message": "Pasirinkite kiekvieną frazę, kad patikrintumėte, ar ji tinkama"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index ad541d917..4531820a4 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Nodevas palielināšana var saīsināt apstrādes laiku, bet ne garantēti."
   },
-  "customRPC": {
-    "message": "Pielāgots RPC izsaukums"
-  },
   "customToken": {
     "message": "Pielāgots marķieris"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Daļskaitļiem jābūt diapazonā no 0 līdz 36."
   },
-  "defaultNetwork": {
-    "message": "Galvenais Ether darījumu tīkls ir Mainnet."
-  },
   "delete": {
     "message": "Dzēst"
   },
@@ -619,9 +613,6 @@
   "newContract": {
     "message": "Jauns līgums"
   },
-  "newNetwork": {
-    "message": "Jauns tīkls"
-  },
   "newPassword": {
     "message": "Jauna parole (vism. 8 rakstzīmes)"
   },
@@ -670,12 +661,6 @@
   "on": {
     "message": "Iesl."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Bloķēt Explorer URL (pēc izvēles)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbols (neobligāti)"
-  },
   "origin": {
     "message": "Avots"
   },
@@ -855,9 +840,6 @@
   "selectAnAccount": {
     "message": "Atlasiet kontu"
   },
-  "selectAnAccountHelp": {
-    "message": "Atlasiet kontu, ko skatīt MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Lūdzu, atlasiet katru frāzi, lai pārliecinātos par tās pareizību."
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index f58cb95ba..85d021235 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Meningkatkan fi mungkin akan mengurangkan masa pemprosesan, tetapi ia tidak dijamin."
   },
-  "customRPC": {
-    "message": "RPC Tersuai"
-  },
   "customToken": {
     "message": "Token Tersuai"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Perpuluhan mestilah sekurang-kurangnya 0, dan tidak melebihi 36."
   },
-  "defaultNetwork": {
-    "message": "Rangkaian lalai untuk transaksi Ether ialah Net Utama."
-  },
   "delete": {
     "message": "Padam"
   },
@@ -603,9 +597,6 @@
   "newContract": {
     "message": "Kontrak Baru"
   },
-  "newNetwork": {
-    "message": "Rangkaian Baru"
-  },
   "newPassword": {
     "message": "Kata Laluan Baru (min 8 aks)"
   },
@@ -651,12 +642,6 @@
   "on": {
     "message": "Hidupkan"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Sekat URL Explorer (pilihan)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbol (pilihan)"
-  },
   "origin": {
     "message": "Asal"
   },
@@ -836,9 +821,6 @@
   "selectAnAccount": {
     "message": "Pilih Akaun"
   },
-  "selectAnAccountHelp": {
-    "message": "Pilih akaun untuk dilihat dalam MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Sila pilih setiap ungkapan untuk memastikan ia betul."
   },
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index f5daf1b8b..448eef171 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -67,18 +67,12 @@
   "customGas": {
     "message": "Pas Gas aan"
   },
-  "customRPC": {
-    "message": "Aangepaste RPC"
-  },
   "decimal": {
     "message": "Decimalen van precisie"
   },
   "decimalsMustZerotoTen": {
     "message": "Decimalen moeten minimaal 0 en niet meer dan 36 zijn."
   },
-  "defaultNetwork": {
-    "message": "Het standaardnetwerk voor Ether-transacties is Mainnet."
-  },
   "depositEther": {
     "message": "Stort Ether"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index e04e6a42c..249ea5d10 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -254,9 +254,6 @@
   "customGasSubTitle": {
     "message": "Økt gebyr kan redusere behandlingstiden, men det er ikke garantert."
   },
-  "customRPC": {
-    "message": "Tilpasset RPC"
-  },
   "customToken": {
     "message": "Egendefinert token "
   },
@@ -266,9 +263,6 @@
   "decimalsMustZerotoTen": {
     "message": "Desimaler må være minst 0, og ikke flere enn 36."
   },
-  "defaultNetwork": {
-    "message": "Standardnettverket for Ether-transaksjoner er Mainnet."
-  },
   "delete": {
     "message": "Slett"
   },
@@ -610,9 +604,6 @@
   "newContract": {
     "message": "Ny kontaktperson"
   },
-  "newNetwork": {
-    "message": "Nytt nettverk "
-  },
   "newPassword": {
     "message": "Nytt passord (minimum 8 tegn)"
   },
@@ -661,12 +652,6 @@
   "on": {
     "message": "På"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blokker Explorer URL (valgfritt)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symbol (valgfritt)"
-  },
   "origin": {
     "message": "Opprinnelse"
   },
@@ -843,9 +828,6 @@
   "selectAnAccount": {
     "message": "Velg en konto"
   },
-  "selectAnAccountHelp": {
-    "message": "Velg konto for å vise i MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Velg hver frase for å kontrollere at den er riktig."
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index c7d40dd55..571178bc1 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "Payagan ang external extension na ito na:"
   },
-  "allowOriginSpendToken": {
-    "message": "Payagan ang $1 na gastusin ang iyong $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Payagan ang site na ito na:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "Halaga"
   },
-  "amountWithColon": {
-    "message": "Halaga:"
-  },
   "appDescription": {
     "message": "Ethereum Wallet sa iyong Browser",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "Kapag dinagdagan ang bayarin, mababawasan ang mga oras ng pagproseso, pero hindi ito garantisado."
   },
-  "customRPC": {
-    "message": "Custom na RPC"
-  },
   "customSpendLimit": {
     "message": "Custom na Limitasyon sa Paggastos"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "I-decrypt ang request"
   },
-  "defaultNetwork": {
-    "message": "Ang default na network para sa mga transaksyon ng Ether ay ang Mainnet."
-  },
   "delete": {
     "message": "I-delete"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "Bagong Kontrata"
   },
-  "newNetwork": {
-    "message": "Bagong Network"
-  },
   "newPassword": {
     "message": "Bagong password (min na 8 char)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "Kumonekta lang sa mga site na pinagkakatiwalaan mo."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL ng Block Explorer (opsyonal)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbolo ng Currency (opsyonal)"
-  },
   "origin": {
     "message": "Pinagmulan"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "Nakakonekta na ang account na ito sa MetaMask"
   },
-  "selectAnAccountHelp": {
-    "message": "Pumili ng account na titingnan sa MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "Hindi makita ang iyong account? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Pakipili ang bawat phrase para matiyak na tama ito."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "Payagang palitan ng site na ito ang network?"
   },
-  "switchLedgerPaths": {
-    "message": "Magpalit ng path ng Ledger"
-  },
-  "switchLedgerPathsText": {
-    "message": "Piliin ang path ng Ledger para tingnan ang iba pang account"
-  },
   "switchNetwork": {
     "message": "Lumipat ng network"
   },
@@ -2201,9 +2166,6 @@
     "message": "Para kay/sa: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Para kay/sa:"
-  },
   "token": {
     "message": "Token"
   },
@@ -2281,10 +2243,6 @@
     "message": "Nagkaproblema kami sa pag-load ng mga balanse ng iyong token. Puwede mong tingnan ang mga iyon ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "Pinagkakatiwalaan mo ba ang site na ito? Sa pamamagitan ng pagbibigay ng pahintulot na ito, pinapayagan mo ang $1 na i-withdraw ang iyong $2 at i-automate ang mga transaksyon para sa iyo.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Subukan ulit"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index 1d415a675..0d0f59571 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Zwiększenie opłaty może skrócić czas przetwarzania transakcji, ale nie jest to gwarantowane."
   },
-  "customRPC": {
-    "message": "Własne RPC"
-  },
   "customToken": {
     "message": "Własny token"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Liczb po przecinku musi być co najmniej 0 i nie więcej niż 36."
   },
-  "defaultNetwork": {
-    "message": "Domyślna sieć dla Eteru to Mainnet."
-  },
   "delete": {
     "message": "Usuń"
   },
@@ -620,9 +614,6 @@
   "newContract": {
     "message": "Nowy kontrakt"
   },
-  "newNetwork": {
-    "message": "Nowa sieć"
-  },
   "newPassword": {
     "message": "Nowe hasło (min. 8 znaków)"
   },
@@ -668,12 +659,6 @@
   "on": {
     "message": "Włączone"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Adres URL przeglądarki łańcucha bloków (opcjonalnie)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symbol (opcjonalnie)"
-  },
   "origin": {
     "message": "Pochodzenie"
   },
@@ -853,9 +838,6 @@
   "selectAnAccount": {
     "message": "Wybierz konto"
   },
-  "selectAnAccountHelp": {
-    "message": "Wybierz konto do przeglądania w MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Wybierz każdą frazę, aby upewnić się, że jest poprawna."
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 283ebdfb2..c04767a2d 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -70,18 +70,12 @@
   "customGas": {
     "message": "Customizar Gas"
   },
-  "customRPC": {
-    "message": "Customizar RPC"
-  },
   "decimal": {
     "message": "Precisão em Decimais"
   },
   "decimalsMustZerotoTen": {
     "message": "Decimais devem ser no mínimo 0 e não passar de 36."
   },
-  "defaultNetwork": {
-    "message": "A rede pré definida para transações em Ether é a Mainnet."
-  },
   "depositEther": {
     "message": "Depositar Ether"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 40bde73d3..bd2e54f12 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "Permitir que esta extensão externa:"
   },
-  "allowOriginSpendToken": {
-    "message": "Permitir que $1 gaste seus(suas) $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Permitir que este site:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "Valor"
   },
-  "amountWithColon": {
-    "message": "Valor:"
-  },
   "appDescription": {
     "message": "Uma carteira do Ethereum no seu navegador",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "Aumentar a taxa pode diminuir o tempo de processamento, mas não é garantia."
   },
-  "customRPC": {
-    "message": "RPC personalizada"
-  },
   "customSpendLimit": {
     "message": "Limite de gastos personalizado"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "Descriptografar solicitação"
   },
-  "defaultNetwork": {
-    "message": "A rede padrão das transações em ether é a Mainnet."
-  },
   "delete": {
     "message": "Excluir"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "Novo contrato"
   },
-  "newNetwork": {
-    "message": "Nova rede"
-  },
   "newPassword": {
     "message": "Nova senha (mín. 8 caract.)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "Conecte-se somente com sites em quem você confia."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL do Block Explorer (opcional)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Símbolo de moeda (opcional)"
-  },
   "origin": {
     "message": "Origem"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "Esta conta já foi conectada ao MetaMask"
   },
-  "selectAnAccountHelp": {
-    "message": "Selecione uma conta a ser exibida no MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "Não está vendo sua conta? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Selecione cada frase para garantir que esteja correta."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "Permitir que este site mude a rede?"
   },
-  "switchLedgerPaths": {
-    "message": "Mudar caminhos do Ledger"
-  },
-  "switchLedgerPathsText": {
-    "message": "Selecione o caminho do Ledger para ver outras contas"
-  },
   "switchNetwork": {
     "message": "Trocar de rede"
   },
@@ -2201,9 +2166,6 @@
     "message": "Até: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Até:"
-  },
   "token": {
     "message": "Token"
   },
@@ -2281,10 +2243,6 @@
     "message": "Tivemos dificuldade para carregar os saldos do seu token. Você pode exibi-los ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "Você confia neste site? Ao conceder esta permissão, você está permitindo que $1 saque seus(suas) $2 e automatize as transações por você.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Tente novamente"
   },
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 97f49a7a5..167fb1c26 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Creșterea taxei poate reduce timpii de procesare, dar acest lucru nu este garantat."
   },
-  "customRPC": {
-    "message": "RPC particularizat"
-  },
   "customToken": {
     "message": "Token personalizat"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Zecimalele trebuie să fie cel puțin 0, dar nu peste 36."
   },
-  "defaultNetwork": {
-    "message": "Rețeaua implicită pentru tranzacțiile cu Ether este Mainnet."
-  },
   "delete": {
     "message": "Șterge"
   },
@@ -610,9 +604,6 @@
   "newContract": {
     "message": "Contract nou"
   },
-  "newNetwork": {
-    "message": "Rețea nouă"
-  },
   "newPassword": {
     "message": "Parola Nouă (minimum 8 caractere)"
   },
@@ -661,12 +652,6 @@
   "on": {
     "message": "Activat"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL explorator bloc (opțional)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbol (opțional)"
-  },
   "origin": {
     "message": "Origine"
   },
@@ -846,9 +831,6 @@
   "selectAnAccount": {
     "message": "Selectați un cont"
   },
-  "selectAnAccountHelp": {
-    "message": "Selectați contul de vizualizat în MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Vă rugăm să selectați fiecare expresie pentru a vă asigura că este corectă."
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 881ee1042..40ccc7d45 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "Разрешить этому внешнему расширению:"
   },
-  "allowOriginSpendToken": {
-    "message": "Разрешить $1 потратить ваши $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Разрешить этому сайту:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "Сумма"
   },
-  "amountWithColon": {
-    "message": "Сумма:"
-  },
   "appDescription": {
     "message": "Кошелек Ethereum в вашем браузере",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "Увеличение комиссии может сократить время обработки, но это не гарантируется."
   },
-  "customRPC": {
-    "message": "Пользовательский RPC"
-  },
   "customSpendLimit": {
     "message": "Пользовательский предел расходов"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "Расшифровать запрос"
   },
-  "defaultNetwork": {
-    "message": "Сетью по умолчанию для транзакций Ether является Mainnet."
-  },
   "delete": {
     "message": "Удалить"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "Новый контракт"
   },
-  "newNetwork": {
-    "message": "Новая сеть"
-  },
   "newPassword": {
     "message": "Новый пароль (мин.8 знаков)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "Подключайтесь только к сайтам, которым доверяете."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL-адрес проводника блока (необязательно)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Символ валюты (необязательно)"
-  },
   "origin": {
     "message": "Источник"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "Этот счет уже подключен к MetaMask"
   },
-  "selectAnAccountHelp": {
-    "message": "Выберите счет для просмотра в MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "Не видите свой счет? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Выберите каждую фразу, чтобы убедиться, что она верна."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "Разрешить этому сайту переключить сеть?"
   },
-  "switchLedgerPaths": {
-    "message": "Переключить пути Ledger"
-  },
-  "switchLedgerPathsText": {
-    "message": "Выберите путь Ledger для просмотра других счетов"
-  },
   "switchNetwork": {
     "message": "Переключить сеть"
   },
@@ -2201,9 +2166,6 @@
     "message": "Адресат $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Адресат"
-  },
   "token": {
     "message": "Токен"
   },
@@ -2281,10 +2243,6 @@
     "message": "У нас возникли проблемы с загрузкой вашего баланса токенов. Вы можете просмотреть их ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "Вы доверяете этому сайту? Предоставляя это разрешение, вы разрешаете $1 вывести ваши $2 и автоматизировать транзакции для вас.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Попробуйте еще раз"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index aefb96bd1..47097b3d1 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -251,9 +251,6 @@
   "customGasSubTitle": {
     "message": "Zvýšenie poplatku môže skrátiť dobu spracovania, nie je to však zaručené."
   },
-  "customRPC": {
-    "message": "Vlastní RPC"
-  },
   "customToken": {
     "message": "Vlastní token"
   },
@@ -263,9 +260,6 @@
   "decimalsMustZerotoTen": {
     "message": "Desetinných míst musí být od 0 do 36."
   },
-  "defaultNetwork": {
-    "message": "Výchozí síť pro Etherové transakce je Mainnet."
-  },
   "delete": {
     "message": "Odstrániť"
   },
@@ -595,9 +589,6 @@
   "newContract": {
     "message": "Nový kontrakt"
   },
-  "newNetwork": {
-    "message": "Nová sieť"
-  },
   "newPassword": {
     "message": "Nové heslo (min 8 znaků)"
   },
@@ -643,12 +634,6 @@
   "on": {
     "message": "Zapnuté"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blokovať URL Explorera (voliteľné)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symbol (voliteľné)"
-  },
   "origin": {
     "message": "Pôvod"
   },
@@ -822,9 +807,6 @@
   "selectAnAccount": {
     "message": "Vybrať účet"
   },
-  "selectAnAccountHelp": {
-    "message": "Vyberte účet, ktorý chcete zobraziť v MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Vyberte každú frázu, aby ste sa uistili, že je správna."
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index d9173c49a..e5b7b9e44 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Povečanje lahko skrajša čas obdelave, vendar ni zagotovljeno."
   },
-  "customRPC": {
-    "message": "RPC po meri"
-  },
   "customToken": {
     "message": "Žeton po meri"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Decimalk mora biti med 0 in 36."
   },
-  "defaultNetwork": {
-    "message": "Privzeto omrežje za transkacije je glavno omrežje."
-  },
   "delete": {
     "message": "Izbriši"
   },
@@ -611,9 +605,6 @@
   "newContract": {
     "message": "Nova pogodba"
   },
-  "newNetwork": {
-    "message": "Novo omrežje"
-  },
   "newPassword": {
     "message": "Novo geslo (min 8 znakov)"
   },
@@ -662,12 +653,6 @@
   "on": {
     "message": "Vklopljeno"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blokiraj URL Explorerja (poljubno)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbol (nezahtevano)"
-  },
   "origin": {
     "message": "Izvor"
   },
@@ -847,9 +832,6 @@
   "selectAnAccount": {
     "message": "Izberi račun"
   },
-  "selectAnAccountHelp": {
-    "message": "Izberi račun za prikaz v MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Izberite vsako geslo ter se prepričajte, da je pravilno."
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 1bcfee19a..08eed9bf0 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -254,9 +254,6 @@
   "customGasSubTitle": {
     "message": "Povećanje naknade može smanjiti vreme obrade, ali to nije zagarantovano."
   },
-  "customRPC": {
-    "message": "Korisnički definisan RPC"
-  },
   "customToken": {
     "message": "Prilagođeni token"
   },
@@ -266,9 +263,6 @@
   "decimalsMustZerotoTen": {
     "message": "Decimalni broj mora biti najmanje 0, a ne veći od 36."
   },
-  "defaultNetwork": {
-    "message": "Podrazumevana mreža za Ether transakcije je Mainnet."
-  },
   "delete": {
     "message": "Избриши"
   },
@@ -614,9 +608,6 @@
   "newContract": {
     "message": "Novi ugovor"
   },
-  "newNetwork": {
-    "message": "Nova mreža"
-  },
   "newPassword": {
     "message": "Nova lozinka (minimalno 8 karaktera)"
   },
@@ -665,12 +656,6 @@
   "on": {
     "message": "Укључено"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Blokirajte URL Explorer-a (opciono)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbol (opciono)"
-  },
   "origin": {
     "message": "Извор"
   },
@@ -850,9 +835,6 @@
   "selectAnAccount": {
     "message": "Izaberite nalog"
   },
-  "selectAnAccountHelp": {
-    "message": "Izaberite nalog za prikaz u MetaMask-u"
-  },
   "selectEachPhrase": {
     "message": "Molimo vas izaberite svaki izraz kako biste proverili da je tačan."
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index a49e35d41..1c07f7dfc 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -251,9 +251,6 @@
   "customGasSubTitle": {
     "message": "Att öka avgiften kan minska behandlingstiden, men det är inte garanterat att göra det."
   },
-  "customRPC": {
-    "message": "Anpassad RPC"
-  },
   "customToken": {
     "message": "Anpassad token"
   },
@@ -263,9 +260,6 @@
   "decimalsMustZerotoTen": {
     "message": "Decimalerna måste vara minst 0 och inte över 36."
   },
-  "defaultNetwork": {
-    "message": "Standardnätverket för Ether-transaktioner är Mainnet."
-  },
   "delete": {
     "message": "Radera"
   },
@@ -607,9 +601,6 @@
   "newContract": {
     "message": "Nytt kontrakt"
   },
-  "newNetwork": {
-    "message": "Nytt nätverk"
-  },
   "newPassword": {
     "message": "Nytt lösenord (minst 8 tecken)"
   },
@@ -658,12 +649,6 @@
   "on": {
     "message": "På"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Block Explorer URL (valfritt)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symbol (frivillig)"
-  },
   "origin": {
     "message": "Ursprung"
   },
@@ -843,9 +828,6 @@
   "selectAnAccount": {
     "message": "Välj ett konto"
   },
-  "selectAnAccountHelp": {
-    "message": "Välj konto att visa i MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Välj varje fras för att säkerställa att den är korrekt."
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index e9eed3a4b..05436654c 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -251,9 +251,6 @@
   "customGasSubTitle": {
     "message": "Ada iliyoongezeka inaweza kupunguza muda wa uchakataji, lakini haihakikishwi."
   },
-  "customRPC": {
-    "message": "RPC Maalumu"
-  },
   "customToken": {
     "message": "Kianzio Maalumu"
   },
@@ -263,9 +260,6 @@
   "decimalsMustZerotoTen": {
     "message": "Desimali zinapaswa kuwa angalau 0, na si zaidi ya 36."
   },
-  "defaultNetwork": {
-    "message": "Mtandao chaguomsingi wa miamala ya Ether ni Mainnet."
-  },
   "delete": {
     "message": "Futa"
   },
@@ -601,9 +595,6 @@
   "newContract": {
     "message": "Mkataba Mpya"
   },
-  "newNetwork": {
-    "message": "Mtandao Mpya"
-  },
   "newPassword": {
     "message": "Nenosiri Jipya (kiwango cha chini herufi 8)"
   },
@@ -652,12 +643,6 @@
   "on": {
     "message": "Imewashwa"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL ya Block Explorer URL (hiari)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Ishara (hiari)"
-  },
   "origin": {
     "message": "Asili"
   },
@@ -837,9 +822,6 @@
   "selectAnAccount": {
     "message": "Chagua Akaunti"
   },
-  "selectAnAccountHelp": {
-    "message": "Chagua akaunti kuangalia kwenye MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Tafadhali chagua kila kirai ili kuhakikisha kuwa hii ni sahihi."
   },
diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json
index f754b0532..d39aa6d05 100644
--- a/app/_locales/ta/messages.json
+++ b/app/_locales/ta/messages.json
@@ -103,9 +103,6 @@
   "customGas": {
     "message": "எரிவாயுவைத் தனிப்பயனாக்குங்கள்"
   },
-  "customRPC": {
-    "message": "விருப்ப RPC ஐ"
-  },
   "customToken": {
     "message": "தனிப்பயன் டோக்கன்"
   },
@@ -115,9 +112,6 @@
   "decimalsMustZerotoTen": {
     "message": "தசமங்கள் குறைந்தபட்சம் 0, மற்றும் 36 க்கு மேல் இருக்க வேண்டும்."
   },
-  "defaultNetwork": {
-    "message": "எதிர் பரிவர்த்தனைகளுக்கான முன்னிருப்பு வலையமைப்பு முதன்மை நிகரமாகும்."
-  },
   "delete": {
     "message": "நீக்கு"
   },
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index 43e90d04c..7f3e453c6 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -109,18 +109,12 @@
   "customGasSubTitle": {
     "message": "การเพิ่มค่าธรรมเนียมอาจลดเวลาดำเนินการ แต่ก็ไม่แน่เสมอไป"
   },
-  "customRPC": {
-    "message": "กำหนดค่า RPC เอง"
-  },
   "decimal": {
     "message": "ตำแหน่งของทศนิยม"
   },
   "decimalsMustZerotoTen": {
     "message": "จำนวนต้องมากกว่า 0 และไม่เกิน 36"
   },
-  "defaultNetwork": {
-    "message": "ค่าเริ่มต้นของเครือข่ายสำหรับทำรายการธุรกรรมอีเธอร์คือ Mainnet"
-  },
   "delete": {
     "message": "ลบ"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 55e6587b5..cbd9275ce 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -97,10 +97,6 @@
   "allowExternalExtensionTo": {
     "message": "Payagan ang external extension na ito na:"
   },
-  "allowOriginSpendToken": {
-    "message": "Payagan ang $1 na gastusin ang iyong $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Payagan ang site na ito na:"
   },
@@ -111,9 +107,6 @@
   "amount": {
     "message": "Halaga"
   },
-  "amountWithColon": {
-    "message": "Halaga:"
-  },
   "appDescription": {
     "message": "Ethereum Wallet sa iyong Browser",
     "description": "The description of the application"
@@ -396,9 +389,6 @@
   "customGasSubTitle": {
     "message": "Kapag dinagdagan ang bayarin, mababawasan ang mga oras ng pagproseso, pero hindi ito garantisado."
   },
-  "customRPC": {
-    "message": "Custom na RPC"
-  },
   "customSpendLimit": {
     "message": "Custom na Limitasyon sa Paggastos"
   },
@@ -434,9 +424,6 @@
   "decryptRequest": {
     "message": "I-decrypt ang request"
   },
-  "defaultNetwork": {
-    "message": "Ang default na network para sa mga transaksyon ng Ether ay ang Mainnet."
-  },
   "delete": {
     "message": "I-delete"
   },
@@ -1001,9 +988,6 @@
   "newContract": {
     "message": "Bagong Kontrata"
   },
-  "newNetwork": {
-    "message": "Bagong Network"
-  },
   "newPassword": {
     "message": "Bagong password (min na 8 char)"
   },
@@ -1084,12 +1068,6 @@
   "onlyConnectTrust": {
     "message": "Kumonekta lang sa mga site na pinagkakatiwalaan mo."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL ng Block Explorer (opsyonal)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Simbolo ng Currency (opsyonal)"
-  },
   "origin": {
     "message": "Pinagmulan"
   },
@@ -1319,9 +1297,6 @@
   "selectAnAccount": {
     "message": "Pumili ng Account"
   },
-  "selectAnAccountHelp": {
-    "message": "Piliin ang account na titingnan sa MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Pakipili ang bawat phrase para matiyak na tama ito."
   },
@@ -1749,9 +1724,6 @@
     "message": "Para kay/sa: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Para kay/sa:"
-  },
   "token": {
     "message": "Token"
   },
@@ -1823,10 +1795,6 @@
     "message": "Nagkaproblema kami sa pag-load ng mga balanse ng iyong token. Puwede mong tingnan ang mga iyon ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "Pinagkakatiwalaan mo ba ang site na ito? Sa pamamagitan ng pagbibigay ng pahintulot na ito, pinapayagan mo ang $1 na i-withdraw ang iyong $2 at i-automate ang mga transaksyon para sa iyo.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Subukan ulit"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 977162984..85714e974 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -88,9 +88,6 @@
   "customGas": {
     "message": "Gas'i özelleştir"
   },
-  "customRPC": {
-    "message": "Özel RPC"
-  },
   "customToken": {
     "message": "Özel Jeton"
   },
@@ -100,9 +97,6 @@
   "decimalsMustZerotoTen": {
     "message": "Ondalıklar en azından 0 olmalı ve 36'dan büyük olmamalı."
   },
-  "defaultNetwork": {
-    "message": "Ether işlemleri için varsayılan ağ Mainnet."
-  },
   "depositEther": {
     "message": "Ether yatır"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index fe88a0e32..8968e2f2e 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -257,9 +257,6 @@
   "customGasSubTitle": {
     "message": "Збільшення комісії може призвести до зменшення часу обробки, але це не гарантується."
   },
-  "customRPC": {
-    "message": "Налаштувати RPC"
-  },
   "customToken": {
     "message": "Користувацький токен"
   },
@@ -269,9 +266,6 @@
   "decimalsMustZerotoTen": {
     "message": "Кількість розрядів після коми: від 0 до 36."
   },
-  "defaultNetwork": {
-    "message": "Мережа для транзакцій з Ether за замовчуванням - Mainnet."
-  },
   "delete": {
     "message": "Видалити"
   },
@@ -623,9 +617,6 @@
   "newContract": {
     "message": "Новий контракт"
   },
-  "newNetwork": {
-    "message": "Нова мережа"
-  },
   "newPassword": {
     "message": "Новий пароль (мінімум 8 символів)"
   },
@@ -674,12 +665,6 @@
   "on": {
     "message": "Увімкнути"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "Блокувати Explorer URL (не обов'язково)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Символ (не обов'язково)"
-  },
   "origin": {
     "message": "Походження"
   },
@@ -859,9 +844,6 @@
   "selectAnAccount": {
     "message": "Виберіть обліковий запис"
   },
-  "selectAnAccountHelp": {
-    "message": "Оберіть обліковий запис для перегляду в MetaMask"
-  },
   "selectEachPhrase": {
     "message": "Виберіть кожну фразу, щоб переконатися, що вона правильна."
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index a1f78fa6d..584c892c3 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -130,10 +130,6 @@
   "allowExternalExtensionTo": {
     "message": "Cho phép tiện ích bên ngoài này:"
   },
-  "allowOriginSpendToken": {
-    "message": "Cho phép $1 chi tiêu $2 của bạn?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "Cho phép trang web này:"
   },
@@ -144,9 +140,6 @@
   "amount": {
     "message": "Số tiền"
   },
-  "amountWithColon": {
-    "message": "Số tiền:"
-  },
   "appDescription": {
     "message": "Ví Ethereum trên trình duyệt của bạn",
     "description": "The description of the application"
@@ -474,9 +467,6 @@
   "customGasSubTitle": {
     "message": "Việc tăng phí có thể giúp giảm thời gian xử lý, nhưng điều này không được đảm bảo."
   },
-  "customRPC": {
-    "message": "RPC tùy chỉnh"
-  },
   "customSpendLimit": {
     "message": "Giới hạn chi tiêu tùy chỉnh"
   },
@@ -512,9 +502,6 @@
   "decryptRequest": {
     "message": "Yêu cầu của Decrypt"
   },
-  "defaultNetwork": {
-    "message": "Mạng mặc định cho các giao dịch Ether là Mạng chính thức."
-  },
   "delete": {
     "message": "Xóa"
   },
@@ -1193,9 +1180,6 @@
   "newContract": {
     "message": "Hợp đồng mới"
   },
-  "newNetwork": {
-    "message": "Mạng mới"
-  },
   "newPassword": {
     "message": "Mật khẩu mới (tối thiểu 8 ký tự)"
   },
@@ -1334,12 +1318,6 @@
   "onlyConnectTrust": {
     "message": "Chỉ kết nối với các trang web mà bạn tin tưởng."
   },
-  "optionalBlockExplorerUrl": {
-    "message": "URL trình khám phá khối (không bắt buộc)"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Ký hiệu tiền tệ (không bắt buộc)"
-  },
   "origin": {
     "message": "Nguồn gốc"
   },
@@ -1638,13 +1616,6 @@
   "selectAnAccountAlreadyConnected": {
     "message": "Tài khoản này đã được kết nối với MetaMask"
   },
-  "selectAnAccountHelp": {
-    "message": "Chọn một tài khoản để xem trong MetaMask."
-  },
-  "selectAnAccountHelpDirections": {
-    "message": "Bạn không thấy tài khoản của mình? $1",
-    "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
-  },
   "selectEachPhrase": {
     "message": "Vui lòng chọn từng cụm mật khẩu theo thứ tự để đảm bảo sự chính xác."
   },
@@ -2125,12 +2096,6 @@
   "switchEthereumChainConfirmationTitle": {
     "message": "Cho phép trang web này chuyển mạng?"
   },
-  "switchLedgerPaths": {
-    "message": "Chuyển đường dẫn Ledger"
-  },
-  "switchLedgerPathsText": {
-    "message": "Chọn đường dẫn Ledger để xem các tài khoản khác"
-  },
   "switchNetwork": {
     "message": "Chuyển mạng"
   },
@@ -2201,9 +2166,6 @@
     "message": "Đến: $1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "Đến:"
-  },
   "token": {
     "message": "Token"
   },
@@ -2281,10 +2243,6 @@
     "message": "Chúng tôi đã gặp phải vấn đề khi tải số dư token của bạn. Bạn có thể xem số dư ",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "Bạn có tin tưởng trang web này không? Bằng việc cấp quyền này, bạn sẽ cho phép $1 rút $2 của bạn và tự động thực hiện các giao dịch cho bạn.",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "Thử lại"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index bbd980f1d..8555b89a4 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -103,10 +103,6 @@
   "allowExternalExtensionTo": {
     "message": "允许这个外部扩展到："
   },
-  "allowOriginSpendToken": {
-    "message": "允许 $1 使用您的 $2?",
-    "description": "$1 is the url of the site and $2 is the symbol of the token they are requesting to spend"
-  },
   "allowThisSiteTo": {
     "message": "允许本网站："
   },
@@ -117,9 +113,6 @@
   "amount": {
     "message": "数额"
   },
-  "amountWithColon": {
-    "message": "数额："
-  },
   "appDescription": {
     "message": "以太坊浏览器插件",
     "description": "The description of the application"
@@ -405,9 +398,6 @@
   "customGasSubTitle": {
     "message": "提升费用可能会缩短处理时间，但不保证绝对有效。"
   },
-  "customRPC": {
-    "message": "自定义 RPC"
-  },
   "customSpendLimit": {
     "message": "自定义消费限额"
   },
@@ -443,9 +433,6 @@
   "decryptRequest": {
     "message": "解密请求"
   },
-  "defaultNetwork": {
-    "message": "默认以太坊（Ether）交易网络为主网。"
-  },
   "delete": {
     "message": "删除"
   },
@@ -516,7 +503,7 @@
     "message": "编辑权限"
   },
   "encryptionPublicKeyNotice": {
-    "message": "$1 希望得到您的加密公钥。同意后该网站将可以想您发送加密信息。",
+    "message": "$1 希望得到您的加密公钥。同意后该网站将可以向您发送加密信息。",
     "description": "$1 is the web3 site name"
   },
   "encryptionPublicKeyRequest": {
@@ -1004,9 +991,6 @@
   "newContract": {
     "message": "新合约"
   },
-  "newNetwork": {
-    "message": "新增网络"
-  },
   "newPassword": {
     "message": "新密码（至少 8 个字符）"
   },
@@ -1087,12 +1071,6 @@
   "onlyConnectTrust": {
     "message": "只连接您信任的网站。"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "区块浏览器 URL（选填）"
-  },
-  "optionalCurrencySymbol": {
-    "message": "符号（选填）"
-  },
   "origin": {
     "message": "来源"
   },
@@ -1322,9 +1300,6 @@
   "selectAnAccount": {
     "message": "选择一个账户"
   },
-  "selectAnAccountHelp": {
-    "message": "选择在 MetaMask 中查看的账户"
-  },
   "selectEachPhrase": {
     "message": "请选择每个单词，以确保其正确性。"
   },
@@ -1773,9 +1748,6 @@
     "message": "至：$1",
     "description": "$1 is the address to include in the To label. It is typically shortened first using shortenAddress"
   },
-  "toWithColon": {
-    "message": "至："
-  },
   "token": {
     "message": "代币"
   },
@@ -1847,10 +1819,6 @@
     "message": "我们无法加载您的代币余额。您可以查看它们",
     "description": "Followed by a link (here) to view token balances"
   },
-  "trustSiteApprovePermission": {
-    "message": "您信任这个网站吗？授权即表示您允许 $1 提取您的 $2，并为您自动进行交易。",
-    "description": "$1 is the url requesting permission and $2 is the symbol of the currency that the request is for"
-  },
   "tryAgain": {
     "message": "重试"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 82035e758..91a527f48 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -266,9 +266,6 @@
   "customGasSubTitle": {
     "message": "提升費用可能會加快處理時間，但不保證"
   },
-  "customRPC": {
-    "message": "自訂 RPC"
-  },
   "customToken": {
     "message": "自訂代幣"
   },
@@ -278,9 +275,6 @@
   "decimalsMustZerotoTen": {
     "message": "小數點後位數至少為0, 最多為36."
   },
-  "defaultNetwork": {
-    "message": "預設以太幣交易網路為主網路"
-  },
   "delete": {
     "message": "刪除"
   },
@@ -629,9 +623,6 @@
   "newContract": {
     "message": "建立新合約"
   },
-  "newNetwork": {
-    "message": "新增網路"
-  },
   "newPassword": {
     "message": "新密碼（至少8個字元）"
   },
@@ -674,12 +665,6 @@
   "on": {
     "message": "開啟"
   },
-  "optionalBlockExplorerUrl": {
-    "message": "區塊鏈瀏覽器 URL（非必要）"
-  },
-  "optionalCurrencySymbol": {
-    "message": "Symbol (可選)"
-  },
   "origin": {
     "message": "來源"
   },
diff --git a/app/build-types/beta/beta-mascot.json b/app/build-types/beta/beta-mascot.json
deleted file mode 100644
index 5f922a57e..000000000
--- a/app/build-types/beta/beta-mascot.json
+++ /dev/null
@@ -1,337 +0,0 @@
-{
-  "chunks": [
-    {
-      "color": [0, 0, 0],
-      "faces": [
-        [11, 12, 13],
-        [36, 15, 37],
-        [37, 38, 36],
-        [31, 39, 22],
-        [22, 21, 31],
-        [31, 15, 36],
-        [36, 39, 31],
-        [64, 65, 66],
-        [75, 69, 26],
-        [26, 80, 75],
-        [75, 80, 38],
-        [38, 37, 75],
-        [38, 80, 39],
-        [39, 36, 38],
-        [39, 80, 26],
-        [26, 22, 39]
-      ]
-    },
-    {
-      "color": [236, 229, 220],
-      "faces": [
-        [19, 20, 21],
-        [21, 22, 19],
-        [20, 19, 23],
-        [23, 24, 20],
-        [23, 25, 24],
-        [19, 22, 26],
-        [26, 27, 19],
-        [23, 28, 29],
-        [23, 29, 30],
-        [25, 23, 30],
-        [21, 20, 24],
-        [24, 31, 21],
-        [24, 25, 30],
-        [29, 51, 52],
-        [52, 30, 29],
-        [27, 26, 69],
-        [69, 70, 27],
-        [70, 71, 72],
-        [72, 27, 70],
-        [72, 71, 73],
-        [51, 74, 72],
-        [52, 51, 72],
-        [73, 52, 72],
-        [69, 71, 70],
-        [71, 69, 75],
-        [52, 73, 71],
-        [19, 27, 74],
-        [74, 28, 19],
-        [51, 29, 28],
-        [28, 74, 51],
-        [74, 27, 72],
-        [28, 23, 19]
-      ]
-    },
-    {
-      "color": [119, 228, 171],
-      "faces": [
-        [5, 4, 35],
-        [57, 59, 79]
-      ]
-    },
-    {
-      "color": [80, 157, 116],
-      "faces": [
-        [4, 5, 2],
-        [2, 5, 6],
-        [57, 56, 55],
-        [58, 59, 55],
-        [2, 1, 4],
-        [55, 59, 57]
-      ]
-    },
-    {
-      "color": [67, 127, 95],
-      "faces": [
-        [0, 1, 2],
-        [2, 3, 0],
-        [6, 3, 2],
-        [7, 8, 9],
-        [10, 3, 6],
-        [10, 50, 7],
-        [7, 3, 10],
-        [7, 9, 3],
-        [49, 0, 9],
-        [3, 9, 0],
-        [53, 54, 55],
-        [55, 56, 53],
-        [55, 54, 58],
-        [60, 61, 62],
-        [63, 58, 54],
-        [63, 60, 89],
-        [60, 63, 54],
-        [60, 54, 61],
-        [88, 61, 53],
-        [54, 53, 61]
-      ]
-    },
-    {
-      "color": [119, 228, 207],
-      "faces": [
-        [59, 5, 35],
-        [35, 79, 59]
-      ]
-    },
-    {
-      "color": [163, 230, 235],
-      "faces": [
-        [14, 15, 11],
-        [11, 16, 14],
-        [16, 13, 12],
-        [17, 33, 10],
-        [17, 18, 34],
-        [34, 33, 17],
-        [11, 15, 31],
-        [18, 12, 11],
-        [41, 64, 37],
-        [64, 41, 40],
-        [66, 65, 40],
-        [67, 63, 77],
-        [67, 77, 76],
-        [76, 68, 67],
-        [75, 37, 64],
-        [68, 64, 66]
-      ]
-    },
-    {
-      "color": [204, 237, 236],
-      "faces": [
-        [10, 6, 17],
-        [31, 18, 11],
-        [14, 16, 40],
-        [40, 41, 14],
-        [63, 67, 58],
-        [64, 68, 75],
-        [14, 41, 37],
-        [37, 15, 14],
-        [5, 59, 40],
-        [40, 16, 5]
-      ]
-    },
-    {
-      "color": [207, 248, 247],
-      "faces": [
-        [6, 5, 16],
-        [16, 17, 6],
-        [12, 17, 16],
-        [58, 67, 40],
-        [40, 59, 58],
-        [40, 67, 66]
-      ]
-    },
-    {
-      "color": [127, 185, 228],
-      "faces": [
-        [33, 34, 24],
-        [71, 76, 77]
-      ]
-    },
-    {
-      "color": [119, 200, 228],
-      "faces": [
-        [31, 24, 18],
-        [24, 34, 18],
-        [35, 4, 42],
-        [4, 1, 42],
-        [42, 43, 44],
-        [44, 35, 42],
-        [45, 43, 42],
-        [42, 10, 45],
-        [30, 32, 24],
-        [30, 33, 32],
-        [33, 30, 10],
-        [44, 43, 46],
-        [43, 45, 47],
-        [47, 46, 43],
-        [48, 47, 45],
-        [45, 30, 48],
-        [30, 45, 10],
-        [49, 42, 0],
-        [8, 7, 42],
-        [50, 42, 7],
-        [50, 10, 42],
-        [1, 0, 42],
-        [42, 9, 8],
-        [42, 49, 9],
-        [75, 68, 71],
-        [71, 68, 76],
-        [79, 81, 57],
-        [57, 81, 56],
-        [82, 79, 35],
-        [35, 44, 82],
-        [81, 79, 82],
-        [82, 83, 81],
-        [84, 63, 81],
-        [81, 83, 84],
-        [44, 46, 85],
-        [85, 82, 44],
-        [71, 78, 52],
-        [52, 78, 77],
-        [77, 63, 52],
-        [82, 85, 83],
-        [83, 85, 86],
-        [86, 84, 83],
-        [87, 52, 84],
-        [84, 86, 87],
-        [52, 63, 84],
-        [88, 53, 81],
-        [62, 81, 60],
-        [89, 60, 81],
-        [89, 81, 63],
-        [56, 81, 53],
-        [81, 62, 61],
-        [81, 61, 88],
-        [48, 87, 86],
-        [86, 47, 48],
-        [47, 86, 85],
-        [85, 46, 47],
-        [48, 30, 52],
-        [52, 87, 48]
-      ]
-    },
-    {
-      "color": [95, 167, 211],
-      "faces": [
-        [24, 32, 33],
-        [77, 78, 71]
-      ]
-    },
-    {
-      "color": [119, 222, 228],
-      "faces": [
-        [17, 12, 18],
-        [13, 16, 11],
-        [67, 68, 66],
-        [65, 64, 40]
-      ]
-    }
-  ],
-  "positions": [
-    [111.024597, 52.604599, 46.225899],
-    [114.025002, 87.673302, 58.9818],
-    [66.192001, 80.898003, 55.394299],
-    [72.113297, 35.491798, 30.871401],
-    [97.804497, 116.560997, 73.978798],
-    [16.7623, 58.010899, 58.078201],
-    [52.608898, 30.3641, 42.556099],
-    [106.881401, 31.945499, 46.9133],
-    [113.484596, 38.6049, 49.121498],
-    [108.6633, 43.2332, 46.315399],
-    [101.216599, 15.9822, 46.308201],
-    [16.6605, -16.2883, 93.618698],
-    [40.775002, -10.2288, 85.276398],
-    [23.926901, -2.5103, 86.736504],
-    [11.1691, -7.0037, 99.377602],
-    [9.5692, -34.393902, 141.671997],
-    [12.596, 7.1655, 88.740997],
-    [61.180901, 8.8142, 76.996803],
-    [39.719501, -28.927099, 88.963799],
-    [13.7962, -68.575699, 132.057007],
-    [15.2674, -62.32, 129.688004],
-    [14.8446, -52.6096, 140.113007],
-    [12.8917, -49.771599, 144.740997],
-    [35.604198, -71.758003, 81.063904],
-    [47.462502, -68.606102, 63.369701],
-    [38.2486, -64.730202, 38.909901],
-    [-12.8917, -49.771599, 144.740997],
-    [-13.7962, -68.575699, 132.057007],
-    [17.802099, -71.758003, 81.063904],
-    [19.1243, -69.0168, 49.420101],
-    [38.2486, -66.275597, 17.776199],
-    [12.8928, -36.703499, 141.671997],
-    [109.283997, -93.589897, 27.824301],
-    [122.117996, -36.8894, 35.025002],
-    [67.7668, -30.197001, 78.417801],
-    [33.180698, 101.851997, 25.3186],
-    [9.4063, -35.589802, 150.722],
-    [-9.5692, -34.393902, 141.671997],
-    [-9.4063, -35.589802, 150.722],
-    [11.4565, -37.899399, 150.722],
-    [-12.596, 7.1655, 88.740997],
-    [-11.1691, -7.0037, 99.377602],
-    [70.236504, 62.836201, -3.9475],
-    [47.263401, 54.293999, -27.414801],
-    [28.7302, 91.731102, -24.972601],
-    [69.167603, 6.5862, -12.7757],
-    [28.7302, 49.1003, -48.3596],
-    [31.903, 5.692, -47.821999],
-    [35.075802, -34.432899, -16.280899],
-    [115.284103, 48.681499, 48.684101],
-    [110.842796, 28.4821, 49.176201],
-    [-19.1243, -69.0168, 49.420101],
-    [-38.2486, -66.275597, 17.776199],
-    [-111.024597, 52.604599, 46.225899],
-    [-72.113297, 35.491798, 30.871401],
-    [-66.192001, 80.898003, 55.394299],
-    [-114.025002, 87.673302, 58.9818],
-    [-97.804497, 116.560997, 73.978798],
-    [-52.608898, 30.3641, 42.556099],
-    [-16.7623, 58.010899, 58.078201],
-    [-106.881401, 31.945499, 46.9133],
-    [-108.6633, 43.2332, 46.315399],
-    [-113.484596, 38.6049, 49.121498],
-    [-101.216599, 15.9822, 46.308201],
-    [-16.6605, -16.2883, 93.618698],
-    [-23.926901, -2.5103, 86.736504],
-    [-40.775002, -10.2288, 85.276398],
-    [-61.180901, 8.8142, 76.996803],
-    [-39.719501, -28.927099, 88.963799],
-    [-14.8446, -52.6096, 140.113007],
-    [-15.2674, -62.32, 129.688004],
-    [-47.462502, -68.606102, 63.369701],
-    [-35.604198, -71.758003, 81.063904],
-    [-38.2486, -64.730202, 38.909901],
-    [-17.802099, -71.758003, 81.063904],
-    [-12.8928, -36.703499, 141.671997],
-    [-67.7668, -30.197001, 78.417801],
-    [-122.117996, -36.8894, 35.025002],
-    [-109.283997, -93.589897, 27.824301],
-    [-33.180698, 101.851997, 25.3186],
-    [-11.4565, -37.899399, 150.722],
-    [-70.236504, 62.836201, -3.9475],
-    [-28.7302, 91.731102, -24.972601],
-    [-47.263401, 54.293999, -27.414801],
-    [-69.167603, 6.5862, -12.7757],
-    [-28.7302, 49.1003, -48.3596],
-    [-31.903, 5.692, -47.821999],
-    [-35.075802, -34.432899, -16.280899],
-    [-115.284103, 48.681499, 48.684101],
-    [-110.842796, 28.4821, 49.176201]
-  ]
-}
diff --git a/app/build-types/beta/images/beta-mascot.json b/app/build-types/beta/images/beta-mascot.json
new file mode 100644
index 000000000..4db57f543
--- /dev/null
+++ b/app/build-types/beta/images/beta-mascot.json
@@ -0,0 +1,830 @@
+{
+  "chunks": [
+    {
+      "faces": [
+        [0, 1, 2],
+        [2, 3, 0],
+        [4, 5, 2],
+        [6, 3, 2],
+        [2, 5, 6],
+        [7, 8, 9],
+        [10, 3, 6],
+        [10, 50, 7],
+        [7, 3, 10],
+        [7, 9, 3],
+        [49, 0, 9],
+        [3, 9, 0],
+        [2, 1, 4]
+      ],
+      "name": "left ear",
+      "gradient": "left-ear-gradient"
+    },
+    {
+      "faces": [
+        [53, 54, 55],
+        [55, 56, 53],
+        [57, 56, 55],
+        [58, 59, 55],
+        [55, 54, 58],
+        [60, 61, 62],
+        [63, 58, 54],
+        [63, 60, 89],
+        [60, 63, 54],
+        [60, 54, 61],
+        [88, 61, 53],
+        [54, 53, 61],
+        [55, 59, 57]
+      ],
+      "name": "right ear",
+      "gradient": "right-ear-gradient"
+    },
+    {
+      "color": [22, 22, 22],
+      "faces": [[11, 12, 13]],
+      "name": "left eye"
+    },
+    {
+      "color": [22, 22, 22],
+      "faces": [[64, 65, 66]],
+      "name": "right eye"
+    },
+    {
+      "faces": [
+        [14, 15, 11],
+        [11, 16, 14]
+      ],
+      "name": "left inner eye",
+      "gradient": "left-inner-eye-gradient"
+    },
+    {
+      "faces": [[17, 12, 18]],
+      "name": "left outer eye",
+      "gradient": "left-outer-eye-gradient"
+    },
+    {
+      "faces": [[41, 64, 37]],
+      "name": "right lower inner eye",
+      "gradient": "right-inner-eye-gradient"
+    },
+    {
+      "faces": [[67, 68, 66]],
+      "name": "right outer eye",
+      "gradient": "right-outer-eye-gradient"
+    },
+    {
+      "color": [192, 173, 158],
+      "faces": [
+        [19, 20, 21],
+        [21, 22, 19],
+        [20, 19, 23],
+        [23, 24, 20],
+        [23, 25, 24],
+        [19, 22, 26],
+        [26, 27, 19],
+        [23, 28, 29],
+        [23, 29, 30],
+        [25, 23, 30],
+        [29, 51, 52],
+        [52, 30, 29],
+        [27, 26, 69],
+        [69, 70, 27],
+        [70, 71, 72],
+        [72, 27, 70],
+        [72, 71, 73],
+        [51, 74, 72],
+        [52, 51, 72],
+        [73, 52, 72],
+        [19, 27, 74],
+        [74, 28, 19],
+        [51, 29, 28],
+        [28, 74, 51],
+        [74, 27, 72],
+        [28, 23, 19]
+      ],
+      "name": "lower chin"
+    },
+    {
+      "color": [215, 193, 179],
+      "faces": [
+        [21, 20, 24],
+        [24, 31, 21]
+      ],
+      "name": "left lower snout"
+    },
+    {
+      "color": [215, 193, 179],
+      "faces": [
+        [69, 71, 70],
+        [71, 69, 75]
+      ],
+      "name": "right lower snout"
+    },
+    {
+      "faces": [[31, 24, 18]],
+      "name": "left upper snout",
+      "gradient": "left-upper-snout-gradient"
+    },
+    {
+      "faces": [
+        [6, 5, 16],
+        [16, 17, 6]
+      ],
+      "name": "left forehead",
+      "gradient": "left-forehead-gradient"
+    },
+    {
+      "faces": [
+        [24, 32, 33],
+        [33, 34, 24]
+      ],
+      "name": "left lower cheek",
+      "gradient": "left-lower-cheek-gradient"
+    },
+    {
+      "faces": [[5, 4, 35]],
+      "name": "left top ear",
+      "gradient": "left-top-ear-gradient"
+    },
+    {
+      "faces": [[75, 68, 71]],
+      "name": "right upper snout",
+      "gradient": "right-upper-snout-gradient"
+    },
+    {
+      "faces": [
+        [58, 67, 40],
+        [40, 59, 58]
+      ],
+      "name": "right forhead",
+      "gradient": "right-forehead-gradient"
+    },
+    {
+      "faces": [
+        [71, 76, 77],
+        [77, 78, 71]
+      ],
+      "name": "right lower cheek",
+      "gradient": "right-lower-cheek-gradient"
+    },
+    {
+      "faces": [[24, 34, 18]],
+      "name": "left middle cheek",
+      "gradient": "left-middle-cheek-gradient"
+    },
+    {
+      "color": [35, 151, 119],
+      "faces": [
+        [16, 13, 12],
+        [12, 17, 16],
+        [13, 16, 11]
+      ],
+      "name": "left above eye"
+    },
+    {
+      "faces": [[71, 68, 76]],
+      "name": "right middle cheek",
+      "gradient": "right-middle-cheek-gradient"
+    },
+    {
+      "color": [35, 151, 119],
+      "faces": [
+        [40, 67, 66],
+        [66, 65, 40],
+        [65, 64, 40]
+      ],
+      "name": "right above eye"
+    },
+    {
+      "color": [22, 22, 22],
+      "faces": [
+        [36, 15, 37],
+        [37, 38, 36],
+        [31, 39, 22],
+        [22, 21, 31],
+        [31, 15, 36],
+        [36, 39, 31],
+        [75, 69, 26],
+        [26, 80, 75],
+        [75, 80, 38],
+        [38, 37, 75],
+        [38, 80, 39],
+        [39, 36, 38],
+        [39, 80, 26],
+        [26, 22, 39]
+      ],
+      "name": "nose"
+    },
+    {
+      "faces": [
+        [17, 33, 10],
+        [17, 18, 34],
+        [34, 33, 17],
+        [10, 6, 17]
+      ],
+      "name": "left upper cheek",
+      "gradient": "left-upper-cheek-gradient"
+    },
+    {
+      "faces": [
+        [11, 15, 31],
+        [31, 18, 11],
+        [18, 12, 11]
+      ],
+      "name": "left below eye",
+      "gradient": "left-below-eye-gradient"
+    },
+    {
+      "faces": [
+        [14, 16, 40],
+        [40, 41, 14],
+        [59, 5, 35],
+        [35, 79, 59],
+        [14, 41, 37],
+        [37, 15, 14],
+        [5, 59, 40],
+        [40, 16, 5]
+      ],
+      "name": "forehead",
+      "gradient": "forehead-gradient"
+    },
+    {
+      "faces": [
+        [67, 63, 77],
+        [67, 77, 76],
+        [76, 68, 67],
+        [63, 67, 58]
+      ],
+      "name": "right upper cheek",
+      "gradient": "right-upper-cheek-gradient"
+    },
+    {
+      "faces": [
+        [64, 68, 75],
+        [75, 37, 64],
+        [68, 64, 66]
+      ],
+      "name": "right below eye",
+      "gradient": "right-below-eye-gradient"
+    },
+    {
+      "faces": [
+        [35, 4, 42],
+        [4, 1, 42],
+        [42, 43, 44],
+        [44, 35, 42],
+        [45, 43, 42],
+        [42, 10, 45],
+        [30, 32, 24],
+        [24, 25, 30],
+        [30, 33, 32],
+        [33, 30, 10],
+        [44, 43, 46],
+        [43, 45, 47],
+        [47, 46, 43],
+        [48, 47, 45],
+        [45, 30, 48],
+        [30, 45, 10],
+        [49, 42, 0],
+        [8, 7, 42],
+        [50, 42, 7],
+        [50, 10, 42],
+        [1, 0, 42],
+        [42, 9, 8],
+        [42, 49, 9],
+        [79, 81, 57],
+        [57, 81, 56],
+        [82, 79, 35],
+        [35, 44, 82],
+        [81, 79, 82],
+        [82, 83, 81],
+        [84, 63, 81],
+        [81, 83, 84],
+        [44, 46, 85],
+        [85, 82, 44],
+        [52, 73, 71],
+        [71, 78, 52],
+        [52, 78, 77],
+        [77, 63, 52],
+        [82, 85, 83],
+        [83, 85, 86],
+        [86, 84, 83],
+        [87, 52, 84],
+        [84, 86, 87],
+        [52, 63, 84],
+        [88, 53, 81],
+        [62, 81, 60],
+        [89, 60, 81],
+        [89, 81, 63],
+        [56, 81, 53],
+        [81, 62, 61],
+        [81, 61, 88],
+        [48, 87, 86],
+        [86, 47, 48],
+        [47, 86, 85],
+        [85, 46, 47],
+        [48, 30, 52],
+        [52, 87, 48]
+      ],
+      "name": "back",
+      "gradient": "back-gradient"
+    },
+    {
+      "faces": [[57, 59, 79]],
+      "name": "right top ear",
+      "gradient": "right-top-ear-gradient"
+    },
+    {
+      "faces": [[64, 41, 40]],
+      "name": "right inner upper eye",
+      "gradient": "right-inner-eye-gradient"
+    }
+  ],
+  "gradients": {
+    "forehead-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#23FE4A"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#BAD8EF"
+        }
+      ],
+      "x1": "50%",
+      "y1": "20.232164948453608%",
+      "x2": "50%",
+      "y2": "74.87123711340206%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-upper-cheek-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#20B475"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#70BDCE"
+        }
+      ],
+      "x1": "77.19501199040768%",
+      "y1": "44.68123711340206%",
+      "x2": "77.19501199040768%",
+      "y2": "68.2861855670103%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-upper-cheek-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#20B475"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#70BDCE"
+        }
+      ],
+      "x1": "22.820719424460435%",
+      "y1": "44.68123711340206%",
+      "x2": "22.820719424460435%",
+      "y2": "68.2861855670103%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-below-eye-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#85BBE1"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#7CCACA"
+        }
+      ],
+      "x1": "54.34676258992806%",
+      "y1": "68.26917525773197%",
+      "x2": "65.3001438848921%",
+      "y2": "68.26917525773197%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-below-eye-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#7CCACA"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#85BBE1"
+        }
+      ],
+      "x1": "34.731223021582736%",
+      "y1": "68.26917525773197%",
+      "x2": "45.65323741007194%",
+      "y2": "68.26917525773197%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-ear-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#074F1E"
+        },
+        {
+          "offset": 0.4286,
+          "stop-color": "#05541C"
+        },
+        {
+          "offset": 0.62,
+          "stop-color": "#006A13"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#007514"
+        }
+      ],
+      "x1": "61.443549160671466%",
+      "y1": "44.51773195876289%",
+      "x2": "93.802206235012%",
+      "y2": "24.439072164948456%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-ear-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#074F1E"
+        },
+        {
+          "offset": 0.4286,
+          "stop-color": "#05541C"
+        },
+        {
+          "offset": 0.62,
+          "stop-color": "#006A13"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#007514"
+        }
+      ],
+      "x1": "32.7432134292566%",
+      "y1": "44.33329896907217%",
+      "x2": "4.853390887290168%",
+      "y2": "19.18181443298969%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-outer-eye-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#43C3A2"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#4FAFC0"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#4FAFC0"
+        }
+      ],
+      "x1": "27.575539568345324%",
+      "y1": "60.519278350515464%",
+      "x2": "34.982350119904076%",
+      "y2": "60.519278350515464%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-outer-eye-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#4FAFC0"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#43C3A2"
+        }
+      ],
+      "x1": "65.01764988009592%",
+      "y1": "60.519278350515464%",
+      "x2": "72.42446043165468%",
+      "y2": "60.519278350515464%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-lower-cheek-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#59ADCB"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#436CC8"
+        }
+      ],
+      "x1": "77.93247002398083%",
+      "y1": "68.15113402061857%",
+      "x2": "77.93247002398083%",
+      "y2": "86.82577319587631%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-lower-cheek-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#59ADCB"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#436CC8"
+        }
+      ],
+      "x1": "22.083165467625896%",
+      "y1": "68.15113402061857%",
+      "x2": "22.083165467625896%",
+      "y2": "86.82577319587631%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-top-ear-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#0ED54A"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#0ED54A"
+        }
+      ],
+      "x1": "13.954513189448441%",
+      "y1": "22.055670103092787%",
+      "x2": "44.146762589928066%",
+      "y2": "22.055670103092787%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-top-ear-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#0ED54A"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#11EB36"
+        }
+      ],
+      "x1": "55.85333333333334%",
+      "y1": "22.055670103092787%",
+      "x2": "86.04556354916068%",
+      "y2": "22.055670103092787%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-forehead-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#15DC5D"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#48CA9F"
+        }
+      ],
+      "x1": "36.3947242206235%",
+      "y1": "34.11144329896908%",
+      "x2": "36.3947242206235%",
+      "y2": "53.59649484536083%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-forehead-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#15DC5D"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#48CA9F"
+        }
+      ],
+      "x1": "63.6052757793765%",
+      "y1": "34.11144329896908%",
+      "x2": "63.6052757793765%",
+      "y2": "53.59649484536083%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-upper-snout-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#54A8CF"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#5393E3"
+        }
+      ],
+      "x1": "38.829736211031175%",
+      "y1": "68.28865979381443%",
+      "x2": "38.829736211031175%",
+      "y2": "81.55670103092784%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-upper-snout-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#54A8CF"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#5393E3"
+        }
+      ],
+      "x1": "61.17026378896883%",
+      "y1": "68.28865979381443%",
+      "x2": "61.17026378896883%",
+      "y2": "81.55670103092784%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-middle-cheek-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#32819D"
+        },
+        {
+          "offset": 0.3363,
+          "stop-color": "#447DCD"
+        }
+      ],
+      "x1": "69.9137649880096%",
+      "y1": "51.063505154639174%",
+      "x2": "69.9137649880096%",
+      "y2": "85.81041237113402%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-middle-cheek-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#32819D"
+        },
+        {
+          "offset": 0.3363,
+          "stop-color": "#447DCD"
+        }
+      ],
+      "x1": "30.086330935251798%",
+      "y1": "68.15092783505153%",
+      "x2": "30.086330935251798%",
+      "y2": "81.55752577319588%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "right-inner-eye-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#53A9CB"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#44C0A6"
+        }
+      ],
+      "x1": "55.38244604316547%",
+      "y1": "74.87123711340206%",
+      "x2": "55.38244604316547%",
+      "y2": "53.59659793814433%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "left-inner-eye-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#53A9CB"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#44C0A6"
+        }
+      ],
+      "x1": "43.58177458033573%",
+      "y1": "64.2339175257732%",
+      "x2": "45.65323741007194%",
+      "y2": "64.2339175257732%",
+      "gradientUnits": "userSpaceOnUse"
+    },
+    "back-gradient": {
+      "type": "linear",
+      "stops": [
+        {
+          "stop-color": "#27FC4E"
+        },
+        {
+          "offset": 1,
+          "stop-color": "#446FC9"
+        }
+      ],
+      "x1": "50%",
+      "y1": "0%",
+      "x2": "50%",
+      "y2": "100%",
+      "gradientUnits": "userSpaceOnUse"
+    }
+  },
+  "positions": [
+    [111.024597, 52.604599, 46.225899],
+    [114.025002, 87.673302, 58.9818],
+    [66.192001, 80.898003, 55.394299],
+    [72.113297, 35.491798, 30.871401],
+    [97.804497, 116.560997, 73.978798],
+    [16.7623, 58.010899, 58.078201],
+    [52.608898, 30.3641, 42.556099],
+    [106.881401, 31.945499, 46.9133],
+    [113.484596, 38.6049, 49.121498],
+    [108.6633, 43.2332, 46.315399],
+    [101.216599, 15.9822, 46.308201],
+    [16.6605, -16.2883, 93.618698],
+    [40.775002, -10.2288, 85.276398],
+    [23.926901, -2.5103, 86.736504],
+    [11.1691, -7.0037, 99.377602],
+    [9.5692, -34.393902, 141.671997],
+    [12.596, 7.1655, 88.740997],
+    [61.180901, 8.8142, 76.996803],
+    [39.719501, -28.927099, 88.963799],
+    [13.7962, -68.575699, 132.057007],
+    [15.2674, -62.32, 129.688004],
+    [14.8446, -52.6096, 140.113007],
+    [12.8917, -49.771599, 144.740997],
+    [35.604198, -71.758003, 81.063904],
+    [47.462502, -68.606102, 63.369701],
+    [38.2486, -64.730202, 38.909901],
+    [-12.8917, -49.771599, 144.740997],
+    [-13.7962, -68.575699, 132.057007],
+    [17.802099, -71.758003, 81.063904],
+    [19.1243, -69.0168, 49.420101],
+    [38.2486, -66.275597, 17.776199],
+    [12.8928, -36.703499, 141.671997],
+    [109.283997, -93.589897, 27.824301],
+    [122.117996, -36.8894, 35.025002],
+    [67.7668, -30.197001, 78.417801],
+    [33.180698, 101.851997, 25.3186],
+    [9.4063, -35.589802, 150.722],
+    [-9.5692, -34.393902, 141.671997],
+    [-9.4063, -35.589802, 150.722],
+    [11.4565, -37.899399, 150.722],
+    [-12.596, 7.1655, 88.740997],
+    [-11.1691, -7.0037, 99.377602],
+    [70.236504, 62.836201, -3.9475],
+    [47.263401, 54.293999, -27.414801],
+    [28.7302, 91.731102, -24.972601],
+    [69.167603, 6.5862, -12.7757],
+    [28.7302, 49.1003, -48.3596],
+    [31.903, 5.692, -47.821999],
+    [35.075802, -34.432899, -16.280899],
+    [115.284103, 48.681499, 48.684101],
+    [110.842796, 28.4821, 49.176201],
+    [-19.1243, -69.0168, 49.420101],
+    [-38.2486, -66.275597, 17.776199],
+    [-111.024597, 52.604599, 46.225899],
+    [-72.113297, 35.491798, 30.871401],
+    [-66.192001, 80.898003, 55.394299],
+    [-114.025002, 87.673302, 58.9818],
+    [-97.804497, 116.560997, 73.978798],
+    [-52.608898, 30.3641, 42.556099],
+    [-16.7623, 58.010899, 58.078201],
+    [-106.881401, 31.945499, 46.9133],
+    [-108.6633, 43.2332, 46.315399],
+    [-113.484596, 38.6049, 49.121498],
+    [-101.216599, 15.9822, 46.308201],
+    [-16.6605, -16.2883, 93.618698],
+    [-23.926901, -2.5103, 86.736504],
+    [-40.775002, -10.2288, 85.276398],
+    [-61.180901, 8.8142, 76.996803],
+    [-39.719501, -28.927099, 88.963799],
+    [-14.8446, -52.6096, 140.113007],
+    [-15.2674, -62.32, 129.688004],
+    [-47.462502, -68.606102, 63.369701],
+    [-35.604198, -71.758003, 81.063904],
+    [-38.2486, -64.730202, 38.909901],
+    [-17.802099, -71.758003, 81.063904],
+    [-12.8928, -36.703499, 141.671997],
+    [-67.7668, -30.197001, 78.417801],
+    [-122.117996, -36.8894, 35.025002],
+    [-109.283997, -93.589897, 27.824301],
+    [-33.180698, 101.851997, 25.3186],
+    [-11.4565, -37.899399, 150.722],
+    [-70.236504, 62.836201, -3.9475],
+    [-28.7302, 91.731102, -24.972601],
+    [-47.263401, 54.293999, -27.414801],
+    [-69.167603, 6.5862, -12.7757],
+    [-28.7302, 49.1003, -48.3596],
+    [-31.903, 5.692, -47.821999],
+    [-35.075802, -34.432899, -16.280899],
+    [-115.284103, 48.681499, 48.684101],
+    [-110.842796, 28.4821, 49.176201]
+  ]
+}
diff --git a/app/build-types/beta/icon-128.png b/app/build-types/beta/images/icon-128.png
similarity index 100%
rename from app/build-types/beta/icon-128.png
rename to app/build-types/beta/images/icon-128.png
diff --git a/app/build-types/beta/icon-16.png b/app/build-types/beta/images/icon-16.png
similarity index 100%
rename from app/build-types/beta/icon-16.png
rename to app/build-types/beta/images/icon-16.png
diff --git a/app/build-types/beta/icon-19.png b/app/build-types/beta/images/icon-19.png
similarity index 100%
rename from app/build-types/beta/icon-19.png
rename to app/build-types/beta/images/icon-19.png
diff --git a/app/build-types/beta/icon-32.png b/app/build-types/beta/images/icon-32.png
similarity index 100%
rename from app/build-types/beta/icon-32.png
rename to app/build-types/beta/images/icon-32.png
diff --git a/app/build-types/beta/icon-38.png b/app/build-types/beta/images/icon-38.png
similarity index 100%
rename from app/build-types/beta/icon-38.png
rename to app/build-types/beta/images/icon-38.png
diff --git a/app/build-types/beta/icon-48.png b/app/build-types/beta/images/icon-48.png
similarity index 100%
rename from app/build-types/beta/icon-48.png
rename to app/build-types/beta/images/icon-48.png
diff --git a/app/build-types/beta/icon-512.png b/app/build-types/beta/images/icon-512.png
similarity index 100%
rename from app/build-types/beta/icon-512.png
rename to app/build-types/beta/images/icon-512.png
diff --git a/app/build-types/beta/icon-64.png b/app/build-types/beta/images/icon-64.png
similarity index 100%
rename from app/build-types/beta/icon-64.png
rename to app/build-types/beta/images/icon-64.png
diff --git a/app/build-types/beta/info-logo.png b/app/build-types/beta/images/info-logo.png
similarity index 100%
rename from app/build-types/beta/info-logo.png
rename to app/build-types/beta/images/info-logo.png
diff --git a/app/build-types/beta/logo/metamask-fox.svg b/app/build-types/beta/images/logo/metamask-fox.svg
similarity index 100%
rename from app/build-types/beta/logo/metamask-fox.svg
rename to app/build-types/beta/images/logo/metamask-fox.svg
diff --git a/app/build-types/beta/logo/metamask-logo-horizontal.svg b/app/build-types/beta/images/logo/metamask-logo-horizontal-dark.svg
similarity index 100%
rename from app/build-types/beta/logo/metamask-logo-horizontal.svg
rename to app/build-types/beta/images/logo/metamask-logo-horizontal-dark.svg
diff --git a/app/build-types/beta/logo/metamask-logo-horizontal-dark.svg b/app/build-types/beta/images/logo/metamask-logo-horizontal.svg
similarity index 100%
rename from app/build-types/beta/logo/metamask-logo-horizontal-dark.svg
rename to app/build-types/beta/images/logo/metamask-logo-horizontal.svg
diff --git a/app/manifest/_beta_modifications.json b/app/build-types/beta/manifest/_base.json
similarity index 100%
rename from app/manifest/_beta_modifications.json
rename to app/build-types/beta/manifest/_base.json
diff --git a/app/build-types/beta/manifest/firefox.json b/app/build-types/beta/manifest/firefox.json
new file mode 100644
index 000000000..79e3cda65
--- /dev/null
+++ b/app/build-types/beta/manifest/firefox.json
@@ -0,0 +1,7 @@
+{
+  "applications": {
+    "gecko": {
+      "id": "webextension-beta@metamask.io"
+    }
+  }
+}
diff --git a/app/build-types/flask/images/flask-mascot.json b/app/build-types/flask/images/flask-mascot.json
new file mode 100644
index 000000000..43b200544
--- /dev/null
+++ b/app/build-types/flask/images/flask-mascot.json
@@ -0,0 +1,824 @@
+{
+  "chunks": [
+    {
+      "faces": [
+        [0, 1, 2],
+        [2, 3, 0],
+        [4, 5, 2],
+        [6, 3, 2],
+        [2, 5, 6],
+        [7, 8, 9],
+        [10, 3, 6],
+        [10, 50, 7],
+        [7, 3, 10],
+        [7, 9, 3],
+        [49, 0, 9],
+        [3, 9, 0],
+        [2, 1, 4]
+      ],
+      "name": "left ear",
+      "gradient": "left-ear-gradient"
+    },
+    {
+      "faces": [
+        [53, 54, 55],
+        [55, 56, 53],
+        [57, 56, 55],
+        [58, 59, 55],
+        [55, 54, 58],
+        [60, 61, 62],
+        [63, 58, 54],
+        [63, 60, 89],
+        [60, 63, 54],
+        [60, 54, 61],
+        [88, 61, 53],
+        [54, 53, 61],
+        [55, 59, 57]
+      ],
+      "name": "right ear",
+      "gradient": "right-ear-gradient"
+    },
+    {
+      "color": [22, 22, 22],
+      "faces": [[11, 12, 13]],
+      "name": "left eye"
+    },
+    {
+      "color": [22, 22, 22],
+      "faces": [[64, 65, 66]],
+      "name": "right eye"
+    },
+    {
+      "faces": [
+        [14, 15, 11],
+        [11, 16, 14]
+      ],
+      "name": "left inner eye",
+      "gradient": "left-inner-eye-gradient"
+    },
+    {
+      "faces": [[17, 12, 18]],
+      "name": "left outer eye",
+      "gradient": "left-outer-eye-gradient"
+    },
+    {
+      "faces": [[41, 64, 37]],
+      "name": "right lower inner eye",
+      "gradient": "right-inner-eye-gradient"
+    },
+    {
+      "faces": [[67, 68, 66]],
+      "name": "right outer eye",
+      "gradient": "right-outer-eye-gradient"
+    },
+    {
+      "color": [223, 117, 84],
+      "faces": [
+        [19, 20, 21],
+        [21, 22, 19],
+        [20, 19, 23],
+        [23, 24, 20],
+        [23, 25, 24],
+        [19, 22, 26],
+        [26, 27, 19],
+        [23, 28, 29],
+        [23, 29, 30],
+        [25, 23, 30],
+        [29, 51, 52],
+        [52, 30, 29],
+        [27, 26, 69],
+        [69, 70, 27],
+        [70, 71, 72],
+        [72, 27, 70],
+        [72, 71, 73],
+        [51, 74, 72],
+        [52, 51, 72],
+        [73, 52, 72],
+        [19, 27, 74],
+        [74, 28, 19],
+        [51, 29, 28],
+        [28, 74, 51],
+        [74, 27, 72],
+        [28, 23, 19]
+      ],
+      "name": "lower chin"
+    },
+    {
+      "color": [255, 159, 90],
+      "faces": [
+        [21, 20, 24],
+        [24, 31, 21]
+      ],
+      "name": "left lower snout"
+    },
+    {
+      "color": [255, 159, 90],
+      "faces": [
+        [69, 71, 70],
+        [71, 69, 75]
+      ],
+      "name": "right lower snout"
+    },
+    {
+      "color": [147, 131, 250],
+      "faces": [[31, 24, 18]],
+      "name": "left upper snout"
+    },
+    {
+      "faces": [
+        [6, 5, 16],
+        [16, 17, 6]
+      ],
+      "name": "left forehead",
+      "gradient": "left-forehead-gradient"
+    },
+    {
+      "faces": [
+        [24, 32, 33],
+        [33, 34, 24]
+      ],
+      "name": "left lower cheek",
+      "gradient": "left-lower-cheek-gradient"
+    },
+    {
+      "faces": [[5, 4, 35]],
+      "name": "left top ear",
+      "gradient": "left-top-ear-gradient"
+    },
+    {
+      "color": [147, 131, 250],
+      "faces": [[75, 68, 71]],
+      "name": "right upper snout"
+    },
+    {
+      "faces": [
+        [58, 67, 40],
+        [40, 59, 58]
+      ],
+      "name": "right forhead",
+      "gradient": "right-forehead-gradient"
+    },
+    {
+      "faces": [
+        [71, 76, 77],
+        [77, 78, 71]
+      ],
+      "name": "right lower cheek",
+      "gradient": "right-lower-cheek-gradient"
+    },
+    {
+      "faces": [[24, 34, 18]],
+      "name": "left middle cheek",
+      "gradient": "left-middle-cheek-gradient"
+    },
+    {
+      "color": [156, 90, 221],
+      "faces": [
+        [16, 13, 12],
+        [12, 17, 16],
+        [13, 16, 11]
+      ],
+      "name": "left above eye"
+    },
+    {
+      "faces": [[71, 68, 76]],
+      "name": "right middle cheek",
+      "gradient": "right-middle-cheek-gradient"
+    },
+    {
+      "color": [156, 90, 221],
+      "faces": [
+        [40, 67, 66],
+        [66, 65, 40],
+        [65, 64, 40]
+      ],
+      "name": "right above eye"
+    },
+    {
+      "color": [22, 22, 22],
+      "faces": [
+        [36, 15, 37],
+        [37, 38, 36],
+        [31, 39, 22],
+        [22, 21, 31],
+        [31, 15, 36],
+        [36, 39, 31],
+        [75, 69, 26],
+        [26, 80, 75],
+        [75, 80, 38],
+        [38, 37, 75],
+        [38, 80, 39],
+        [39, 36, 38],
+        [39, 80, 26],
+        [26, 22, 39]
+      ],
+      "name": "nose"
+    },
+    {
+      "faces": [
+        [17, 33, 10],
+        [17, 18, 34],
+        [34, 33, 17],
+        [10, 6, 17]
+      ],
+      "name": "left upper cheek",
+      "gradient": "left-upper-cheek-gradient"
+    },
+    {
+      "faces": [
+        [11, 15, 31],
+        [31, 18, 11],
+        [18, 12, 11]
+      ],
+      "name": "left below eye",
+      "gradient": "left-below-eye-gradient"
+    },
+    {
+      "faces": [
+        [14, 16, 40],
+        [40, 41, 14],
+        [59, 5, 35],
+        [35, 79, 59],
+        [14, 41, 37],
+        [37, 15, 14],
+        [5, 59, 40],
+        [40, 16, 5]
+      ],
+      "name": "forehead",
+      "gradient": "forehead-gradient"
+    },
+    {
+      "faces": [
+        [67, 63, 77],
+        [67, 77, 76],
+        [76, 68, 67],
+        [63, 67, 58]
+      ],
+      "name": "right upper cheek",
+      "gradient": "right-upper-cheek-gradient"
+    },
+    {
+      "faces": [
+        [64, 68, 75],
+        [75, 37, 64],
+        [68, 64, 66]
+      ],
+      "name": "right below eye",
+      "gradient": "right-below-eye-gradient"
+    },
+    {
+      "faces": [
+        [35, 4, 42],
+        [4, 1, 42],
+        [42, 43, 44],
+        [44, 35, 42],
+        [45, 43, 42],
+        [42, 10, 45],
+        [30, 32, 24],
+        [24, 25, 30],
+        [30, 33, 32],
+        [33, 30, 10],
+        [44, 43, 46],
+        [43, 45, 47],
+        [47, 46, 43],
+        [48, 47, 45],
+        [45, 30, 48],
+        [30, 45, 10],
+        [49, 42, 0],
+        [8, 7, 42],
+        [50, 42, 7],
+        [50, 10, 42],
+        [1, 0, 42],
+        [42, 9, 8],
+        [42, 49, 9],
+        [79, 81, 57],
+        [57, 81, 56],
+        [82, 79, 35],
+        [35, 44, 82],
+        [81, 79, 82],
+        [82, 83, 81],
+        [84, 63, 81],
+        [81, 83, 84],
+        [44, 46, 85],
+        [85, 82, 44],
+        [52, 73, 71],
+        [71, 78, 52],
+        [52, 78, 77],
+        [77, 63, 52],
+        [82, 85, 83],
+        [83, 85, 86],
+        [86, 84, 83],
+        [87, 52, 84],
+        [84, 86, 87],
+        [52, 63, 84],
+        [88, 53, 81],
+        [62, 81, 60],
+        [89, 60, 81],
+        [89, 81, 63],
+        [56, 81, 53],
+        [81, 62, 61],
+        [81, 61, 88],
+        [48, 87, 86],
+        [86, 47, 48],
+        [47, 86, 85],
+        [85, 46, 47],
+        [48, 30, 52],
+        [52, 87, 48]
+      ],
+      "name": "back",
+      "gradient": "back-gradient"
+    },
+    {
+      "faces": [[57, 59, 79]],
+      "name": "right top ear",
+      "gradient": "right-top-ear-gradient"
+    },
+    {
+      "faces": [[64, 41, 40]],
+      "name": "right inner upper eye",
+      "gradient": "right-inner-eye-gradient"
+    }
+  ],
+  "gradients": {
+    "left-inner-eye-gradient": {
+      "type": "linear",
+      "x1": "41.97721822541966%",
+      "y1": "67.79239690721649%",
+      "x2": "44.56654676258992%",
+      "y2": "67.79239690721649%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#BA86F3"
+        },
+        {
+          "offset": "0.5281",
+          "stop-color": "#B786F4"
+        },
+        {
+          "offset": "0.8987",
+          "stop-color": "#AE86F5"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#AA86F6"
+        }
+      ]
+    },
+    "right-inner-eye-gradient": {
+      "type": "linear",
+      "x1": "56.72805755395684%",
+      "y1": "81.08904639175258%",
+      "x2": "56.72805755395684%",
+      "y2": "54.49574742268041%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#BA86F3"
+        },
+        {
+          "offset": "0.5281",
+          "stop-color": "#B786F4"
+        },
+        {
+          "offset": "0.8987",
+          "stop-color": "#AE86F5"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#AA86F6"
+        }
+      ]
+    },
+    "left-middle-cheek-gradient": {
+      "type": "linear",
+      "x1": "25.107913669064747%",
+      "y1": "72.68865979381442%",
+      "x2": "25.107913669064747%",
+      "y2": "89.44690721649484%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#6848BA"
+        },
+        {
+          "offset": "0.3363",
+          "stop-color": "#6356D5"
+        }
+      ]
+    },
+    "right-middle-cheek-gradient": {
+      "type": "linear",
+      "x1": "74.89208633093526%",
+      "y1": "51.32938144329896%",
+      "x2": "74.89208633093526%",
+      "y2": "94.76301546391753%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#6848BA"
+        },
+        {
+          "offset": "0.3363",
+          "stop-color": "#6356D5"
+        }
+      ]
+    },
+    "right-forehead-gradient": {
+      "type": "linear",
+      "x1": "67.00671462829736%",
+      "y1": "30.13930412371134%",
+      "x2": "67.00671462829736%",
+      "y2": "54.49561855670103%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#DC69E6"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#C289F3"
+        }
+      ]
+    },
+    "left-forehead-gradient": {
+      "type": "linear",
+      "x1": "32.99340527577938%",
+      "y1": "30.13930412371134%",
+      "x2": "32.99340527577938%",
+      "y2": "54.49561855670103%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#DC69E6"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#C289F3"
+        }
+      ]
+    },
+    "right-top-ear-gradient": {
+      "type": "linear",
+      "x1": "95.056858513189448%",
+      "y1": "15.06958762886598%",
+      "x2": "57.31654676258992%",
+      "y2": "15.06958762886598%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#BB65ED"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#E560E3"
+        }
+      ]
+    },
+    "left-top-ear-gradient": {
+      "type": "linear",
+      "x1": "4.943141486810552%",
+      "y1": "15.06958762886598%",
+      "x2": "42.68345323741008%",
+      "y2": "15.06958762886598%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#BB65ED"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#E560E3"
+        }
+      ]
+    },
+    "left-lower-cheek-gradient": {
+      "type": "linear",
+      "x1": "15.103956834532372%",
+      "y1": "72.6889175257732%",
+      "x2": "15.103956834532372%",
+      "y2": "96.03221649484537%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#906EF7"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#575ADE"
+        }
+      ]
+    },
+    "right-lower-cheek-gradient": {
+      "type": "linear",
+      "x1": "84.91570743405276%",
+      "y1": "72.6889175257732%",
+      "x2": "84.91570743405276%",
+      "y2": "96.03221649484537%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#906EF7"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#575ADE"
+        }
+      ]
+    },
+    "right-outer-eye-gradient": {
+      "type": "linear",
+      "x1": "68.7720623501199%",
+      "y1": "63.14909793814433%",
+      "x2": "78.03057553956835%",
+      "y2": "63.14909793814433%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#BA86F3"
+        },
+        {
+          "offset": "0.5281",
+          "stop-color": "#B786F4"
+        },
+        {
+          "offset": "0.8987",
+          "stop-color": "#AE86F5"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#AA86F6"
+        }
+      ]
+    },
+    "left-outer-eye-gradient": {
+      "type": "linear",
+      "x1": "21.969424460431654%",
+      "y1": "63.14909793814433%",
+      "x2": "31.227937649880094%",
+      "y2": "63.14909793814433%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#BA86F3"
+        },
+        {
+          "offset": "0.5281",
+          "stop-color": "#B786F4"
+        },
+        {
+          "offset": "0.8987",
+          "stop-color": "#AE86F5"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#AA86F6"
+        }
+      ]
+    },
+    "left-ear-gradient": {
+      "type": "linear",
+      "x1": "50%",
+      "y1": "30%",
+      "x2": "4%",
+      "y2": "4%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#541758"
+        },
+        {
+          "offset": "0.4286",
+          "stop-color": "#4F206C"
+        },
+        {
+          "offset": "0.62",
+          "stop-color": "#4D2577"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#8B45B6"
+        }
+      ]
+    },
+    "right-ear-gradient": {
+      "type": "linear",
+      "x1": "50%",
+      "y1": "30%",
+      "x2": "96%",
+      "y2": "4%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#541758"
+        },
+        {
+          "offset": "0.4286",
+          "stop-color": "#4F206C"
+        },
+        {
+          "offset": "0.62",
+          "stop-color": "#4D2577"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#8B45B6"
+        }
+      ]
+    },
+    "left-below-eye-gradient": {
+      "type": "linear",
+      "x1": "30.914028776978412%",
+      "y1": "72.83646907216496%",
+      "x2": "44.56654676258992%",
+      "y2": "72.83646907216496%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#C8A8F7"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#BAAAFB"
+        }
+      ]
+    },
+    "right-below-eye-gradient": {
+      "type": "linear",
+      "x1": "55.43345323741007%",
+      "y1": "72.83646907216496%",
+      "x2": "69.12517985611511%",
+      "y2": "72.83646907216496%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#C8A8F7"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#BAAAFB"
+        }
+      ]
+    },
+    "left-upper-cheek-gradient": {
+      "type": "linear",
+      "x1": "16.02589928057554%",
+      "y1": "43.35154639175258%",
+      "x2": "16.02589928057554%",
+      "y2": "72.85773195876288%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#B65FE5"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#ADA2FC"
+        }
+      ]
+    },
+    "right-upper-cheek-gradient": {
+      "type": "linear",
+      "x1": "83.99364508393285%",
+      "y1": "43.35154639175258%",
+      "x2": "83.99364508393285%",
+      "y2": "72.85773195876288%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#B65FE5"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#ADA2FC"
+        }
+      ]
+    },
+    "forehead-gradient": {
+      "type": "linear",
+      "x1": "50%",
+      "y1": "12.790180412371136%",
+      "x2": "50%",
+      "y2": "81.08904639175258%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#FB7FE4"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#BCABFB"
+        }
+      ]
+    },
+    "back-gradient": {
+      "type": "linear",
+      "x1": "50%",
+      "y1": "12.790180412371136%",
+      "x2": "50%",
+      "y2": "81.08904639175258%",
+      "gradientUnits": "userSpaceOnUse",
+      "stops": [
+        {
+          "stop-color": "#FB7FE4"
+        },
+        {
+          "offset": "1",
+          "stop-color": "#5C5CE0"
+        }
+      ]
+    }
+  },
+  "positions": [
+    [111.024597, 52.604599, 46.225899],
+    [114.025002, 87.673302, 58.9818],
+    [66.192001, 80.898003, 55.394299],
+    [72.113297, 35.491798, 30.871401],
+    [97.804497, 116.560997, 73.978798],
+    [16.7623, 58.010899, 58.078201],
+    [52.608898, 30.3641, 42.556099],
+    [106.881401, 31.945499, 46.9133],
+    [113.484596, 38.6049, 49.121498],
+    [108.6633, 43.2332, 46.315399],
+    [101.216599, 15.9822, 46.308201],
+    [16.6605, -16.2883, 93.618698],
+    [40.775002, -10.2288, 85.276398],
+    [23.926901, -2.5103, 86.736504],
+    [11.1691, -7.0037, 99.377602],
+    [9.5692, -34.393902, 141.671997],
+    [12.596, 7.1655, 88.740997],
+    [61.180901, 8.8142, 76.996803],
+    [39.719501, -28.927099, 88.963799],
+    [13.7962, -68.575699, 132.057007],
+    [15.2674, -62.32, 129.688004],
+    [14.8446, -52.6096, 140.113007],
+    [12.8917, -49.771599, 144.740997],
+    [35.604198, -71.758003, 81.063904],
+    [47.462502, -68.606102, 63.369701],
+    [38.2486, -64.730202, 38.909901],
+    [-12.8917, -49.771599, 144.740997],
+    [-13.7962, -68.575699, 132.057007],
+    [17.802099, -71.758003, 81.063904],
+    [19.1243, -69.0168, 49.420101],
+    [38.2486, -66.275597, 17.776199],
+    [12.8928, -36.703499, 141.671997],
+    [109.283997, -93.589897, 27.824301],
+    [122.117996, -36.8894, 35.025002],
+    [67.7668, -30.197001, 78.417801],
+    [33.180698, 101.851997, 25.3186],
+    [9.4063, -35.589802, 150.722],
+    [-9.5692, -34.393902, 141.671997],
+    [-9.4063, -35.589802, 150.722],
+    [11.4565, -37.899399, 150.722],
+    [-12.596, 7.1655, 88.740997],
+    [-11.1691, -7.0037, 99.377602],
+    [70.236504, 62.836201, -3.9475],
+    [47.263401, 54.293999, -27.414801],
+    [28.7302, 91.731102, -24.972601],
+    [69.167603, 6.5862, -12.7757],
+    [28.7302, 49.1003, -48.3596],
+    [31.903, 5.692, -47.821999],
+    [35.075802, -34.432899, -16.280899],
+    [115.284103, 48.681499, 48.684101],
+    [110.842796, 28.4821, 49.176201],
+    [-19.1243, -69.0168, 49.420101],
+    [-38.2486, -66.275597, 17.776199],
+    [-111.024597, 52.604599, 46.225899],
+    [-72.113297, 35.491798, 30.871401],
+    [-66.192001, 80.898003, 55.394299],
+    [-114.025002, 87.673302, 58.9818],
+    [-97.804497, 116.560997, 73.978798],
+    [-52.608898, 30.3641, 42.556099],
+    [-16.7623, 58.010899, 58.078201],
+    [-106.881401, 31.945499, 46.9133],
+    [-108.6633, 43.2332, 46.315399],
+    [-113.484596, 38.6049, 49.121498],
+    [-101.216599, 15.9822, 46.308201],
+    [-16.6605, -16.2883, 93.618698],
+    [-23.926901, -2.5103, 86.736504],
+    [-40.775002, -10.2288, 85.276398],
+    [-61.180901, 8.8142, 76.996803],
+    [-39.719501, -28.927099, 88.963799],
+    [-14.8446, -52.6096, 140.113007],
+    [-15.2674, -62.32, 129.688004],
+    [-47.462502, -68.606102, 63.369701],
+    [-35.604198, -71.758003, 81.063904],
+    [-38.2486, -64.730202, 38.909901],
+    [-17.802099, -71.758003, 81.063904],
+    [-12.8928, -36.703499, 141.671997],
+    [-67.7668, -30.197001, 78.417801],
+    [-122.117996, -36.8894, 35.025002],
+    [-109.283997, -93.589897, 27.824301],
+    [-33.180698, 101.851997, 25.3186],
+    [-11.4565, -37.899399, 150.722],
+    [-70.236504, 62.836201, -3.9475],
+    [-28.7302, 91.731102, -24.972601],
+    [-47.263401, 54.293999, -27.414801],
+    [-69.167603, 6.5862, -12.7757],
+    [-28.7302, 49.1003, -48.3596],
+    [-31.903, 5.692, -47.821999],
+    [-35.075802, -34.432899, -16.280899],
+    [-115.284103, 48.681499, 48.684101],
+    [-110.842796, 28.4821, 49.176201]
+  ]
+}
diff --git a/app/build-types/flask/images/icon-128.png b/app/build-types/flask/images/icon-128.png
new file mode 100644
index 000000000..4dddd86c3
Binary files /dev/null and b/app/build-types/flask/images/icon-128.png differ
diff --git a/app/build-types/flask/images/icon-16.png b/app/build-types/flask/images/icon-16.png
new file mode 100644
index 000000000..f67228dbc
Binary files /dev/null and b/app/build-types/flask/images/icon-16.png differ
diff --git a/app/build-types/flask/images/icon-19.png b/app/build-types/flask/images/icon-19.png
new file mode 100644
index 000000000..40ff28ba7
Binary files /dev/null and b/app/build-types/flask/images/icon-19.png differ
diff --git a/app/build-types/flask/images/icon-32.png b/app/build-types/flask/images/icon-32.png
new file mode 100644
index 000000000..79918f98f
Binary files /dev/null and b/app/build-types/flask/images/icon-32.png differ
diff --git a/app/build-types/flask/images/icon-38.png b/app/build-types/flask/images/icon-38.png
new file mode 100644
index 000000000..05f0b4b51
Binary files /dev/null and b/app/build-types/flask/images/icon-38.png differ
diff --git a/app/build-types/flask/images/icon-48.png b/app/build-types/flask/images/icon-48.png
new file mode 100644
index 000000000..5e280b4e0
Binary files /dev/null and b/app/build-types/flask/images/icon-48.png differ
diff --git a/app/build-types/flask/images/icon-512.png b/app/build-types/flask/images/icon-512.png
new file mode 100644
index 000000000..eae504a57
Binary files /dev/null and b/app/build-types/flask/images/icon-512.png differ
diff --git a/app/build-types/flask/images/icon-64.png b/app/build-types/flask/images/icon-64.png
new file mode 100644
index 000000000..680a96b10
Binary files /dev/null and b/app/build-types/flask/images/icon-64.png differ
diff --git a/app/build-types/flask/images/logo/metamask-fox.svg b/app/build-types/flask/images/logo/metamask-fox.svg
new file mode 100644
index 000000000..094aebc36
--- /dev/null
+++ b/app/build-types/flask/images/logo/metamask-fox.svg
@@ -0,0 +1,102 @@
+<svg width="35" height="33" viewBox="0 0 35 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M19.5935 17.7525L20.1702 9.81845L22.5182 4.16699H12.481L14.8289 9.81845L15.4056 17.7525L15.5841 20.2551L15.5979 26.4153H19.4013L19.415 20.2551L19.5935 17.7525Z" fill="url(#paint0_linear)"/>
+<path d="M32.3221 16.2259L25.1408 14.1221L27.3103 17.4084L24.0698 23.7337L28.3539 23.6787H34.725L32.3221 16.2259Z" fill="url(#paint1_linear)"/>
+<path d="M9.8585 14.1221L2.67726 16.2259L0.288086 23.6787H6.65921L10.9295 23.7337L7.68903 17.4084L9.8585 14.1221Z" fill="url(#paint2_linear)"/>
+<path d="M20.3076 21.7263L19.4014 26.4152L20.0604 26.8689L24.0699 23.7338L24.1934 20.585L20.3076 21.7263Z" fill="#ACACAC"/>
+<path d="M10.8193 20.585L10.9292 23.7338L14.9386 26.8689L15.5977 26.4152L14.6914 21.7263L10.8193 20.585Z" fill="#ACACAC"/>
+<path d="M33.8468 10.8216L35.0002 5.21144L33.2701 0L20.061 9.81785L24.9904 14.2455L32.3227 16.2256L33.9018 14.3693L33.2152 13.8742L34.3137 12.8705L33.4761 12.2104L34.5746 11.3717L33.8468 10.8216Z" fill="url(#paint3_linear)"/>
+<path d="M1.15317 10.8216L-0.000226729 5.21144L1.72986 0L14.939 9.81785L10.0096 14.2455L2.67729 16.2256L1.09824 14.3693L1.78479 13.8742L0.686317 12.8705L1.5239 12.2104L0.425429 11.3717L1.15317 10.8216Z" fill="url(#paint4_linear)"/>
+<path d="M7.68945 17.4082L10.8201 20.5846L10.9299 23.7334L7.68945 17.4082Z" fill="#8D8D8D"/>
+<path d="M27.3108 17.4082L24.0703 23.7334L24.1939 20.5846L27.3108 17.4082Z" fill="#8D8D8D"/>
+<path d="M24.7153 29.137L20.0605 26.8682L20.4313 29.907L20.3901 31.1858L24.7153 29.137Z" fill="#FF9F5A"/>
+<path d="M10.2842 29.137L14.6094 31.1858L14.5819 29.907L14.9389 26.8682L10.2842 29.137Z" fill="#FF9F5A"/>
+<path d="M28.354 23.6787L24.7153 29.1377L32.5007 31.2827L34.7251 23.6787H28.354Z" fill="url(#paint5_linear)"/>
+<path d="M0.288574 23.6787L2.49925 31.2827L10.2847 29.1377L6.6597 23.6787H0.288574Z" fill="url(#paint6_linear)"/>
+<path d="M1.72998 0L14.9391 9.81785L12.8657 4.1664L1.72998 0Z" fill="#757575"/>
+<path d="M22.1344 4.1664L20.061 9.81785L33.2701 0L22.1344 4.1664Z" fill="#757575"/>
+<path d="M9.85844 14.1213L7.68896 17.4077L15.4057 17.7514L14.9389 9.81738L9.85844 14.1213Z" fill="url(#paint7_linear)"/>
+<path d="M25.141 14.1213L20.0606 9.81738L19.5938 17.7514L27.3105 17.4077L25.141 14.1213Z" fill="url(#paint8_linear)"/>
+<path d="M10.2842 29.1373L14.9389 26.8685L10.9295 23.7334L10.2842 29.1373Z" fill="url(#paint9_linear)"/>
+<path d="M20.061 26.8685L24.7158 29.1373L24.0704 23.7334L20.061 26.8685Z" fill="url(#paint10_linear)"/>
+<path d="M24.0698 23.7337L24.7152 29.1377L28.3539 23.6787L24.0698 23.7337Z" fill="url(#paint11_linear)"/>
+<path d="M10.9297 23.7337L10.2843 29.1377L6.64565 23.6787L10.9297 23.7337Z" fill="url(#paint12_linear)"/>
+<path d="M27.3105 17.4082L19.5938 17.752L20.3078 21.7259L21.4474 19.3333L24.1936 20.5846L27.3105 17.4082Z" fill="#666666"/>
+<path d="M10.8196 20.5846L13.552 19.3333L14.6917 21.7259L15.4057 17.752L7.68896 17.4082L10.8196 20.5846Z" fill="#666666"/>
+<path d="M20.308 21.7258L19.4155 20.2545L19.594 17.752L20.308 21.7258Z" fill="#8D8D8D"/>
+<path d="M14.6919 21.7258L15.4059 17.752L15.5844 20.2545L14.6919 21.7258Z" fill="#8D8D8D"/>
+<path d="M19.4156 20.2549L20.3081 21.7262L19.4019 26.4151L19.4156 20.2549Z" fill="#8D8D8D"/>
+<path d="M15.5844 20.2549L15.5981 26.4151L14.6919 21.7262L15.5844 20.2549Z" fill="#8D8D8D"/>
+<path d="M20.4148 31.169L20.4313 29.9067L20.088 29.6042H14.9115L14.5819 29.9067L14.6094 31.1855L10.2842 29.1367L11.7946 30.3743L14.8703 32.5056H20.1292L23.2049 30.3743L24.7153 29.1367L20.4148 31.169Z" fill="#DF7554"/>
+<path d="M20.0607 26.8688L19.4016 26.415H15.5981L14.939 26.8688L14.582 29.9077L14.9116 29.6052H20.0881L20.4314 29.9077L20.0607 26.8688Z" fill="#161616" stroke="#161616" stroke-width="0.0657594" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M21.4478 19.333L20.3081 21.7256L24.1939 20.5843L21.4478 19.333Z" fill="#161616"/>
+<path d="M13.5523 19.333L14.6919 21.7256L10.8198 20.5843L13.5523 19.333Z" fill="#161616"/>
+<path d="M33.9015 14.3693L33.215 13.8742L34.3135 12.8705L33.4759 12.2104L34.5743 11.3717L33.8466 10.8216L35 5.21144L33.2699 0L22.1342 4.1664H12.8658L1.73009 0L0 5.21144L1.16712 10.8216L0.425657 11.3717L1.52413 12.2104L0.686544 12.8705L1.78501 13.8742L1.09847 14.3693L2.67752 16.2256L0.288348 23.6783L2.49902 31.2824L10.2844 29.1373L14.9392 26.8685L14.5588 29.9431L14.9117 29.6186L20.0883 29.6048L20.4315 29.9073L20.0608 26.8685L24.7156 29.1373L32.501 31.2824L34.7254 23.6783L32.3225 16.2256L33.9015 14.3693Z" fill="url(#paint13_linear)" fill-opacity="0.1" style="mix-blend-mode:color-dodge"/>
+<path d="M33.9015 14.3693L33.215 13.8742L34.3135 12.8705L33.4759 12.2104L34.5743 11.3717L33.8466 10.8216L35 5.21144L33.2699 0L22.1342 4.1664H12.8658L1.73009 0L0 5.21144L1.16712 10.8216L0.425657 11.3717L1.52413 12.2104L0.686544 12.8705L1.78501 13.8742L1.09847 14.3693L2.67752 16.2256L0.288348 23.6783L2.49902 31.2824L10.2844 29.1373L14.9392 26.8685L15.5845 26.4009H16.5457H18.468H19.4292L20.0608 26.8685L24.7156 29.1373L32.501 31.2824L34.7254 23.6783L32.3225 16.2256L33.9015 14.3693Z" fill="url(#paint14_radial)" style="mix-blend-mode:overlay"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear" x1="17.4996" y1="4.16699" x2="17.4996" y2="26.4153" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8F8F8F"/>
+<stop offset="1" stop-color="#AEAEAE"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="29.3974" y1="14.1221" x2="29.3974" y2="23.7337" gradientUnits="userSpaceOnUse">
+<stop stop-color="#696969"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="5.6088" y1="14.1221" x2="5.6088" y2="23.7337" gradientUnits="userSpaceOnUse">
+<stop stop-color="#696969"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="24.3725" y1="13.4755" x2="36.9499" y2="3.6613" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1B1B1B"/>
+<stop offset="1" stop-color="#565656"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="10.6275" y1="13.4755" x2="-1.94986" y2="3.6613" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1B1B1B"/>
+<stop offset="1" stop-color="#565656"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="29.7202" y1="23.6787" x2="29.7202" y2="31.2827" gradientUnits="userSpaceOnUse">
+<stop stop-color="#787878"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="5.28661" y1="23.6787" x2="5.28661" y2="31.2827" gradientUnits="userSpaceOnUse">
+<stop stop-color="#787878"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="11.5473" y1="9.81738" x2="11.5473" y2="17.7514" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7A7A"/>
+<stop offset="1" stop-color="#949494"/>
+</linearGradient>
+<linearGradient id="paint8_linear" x1="23.4521" y1="9.81738" x2="23.4521" y2="17.7514" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7A7A"/>
+<stop offset="1" stop-color="#949494"/>
+</linearGradient>
+<linearGradient id="paint9_linear" x1="12.6116" y1="32.3962" x2="12.6116" y2="-3.33511" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7C7D"/>
+<stop offset="1" stop-color="#CECECF"/>
+</linearGradient>
+<linearGradient id="paint10_linear" x1="22.3884" y1="32.3962" x2="22.3884" y2="-3.33511" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7C7D"/>
+<stop offset="1" stop-color="#CECECF"/>
+</linearGradient>
+<linearGradient id="paint11_linear" x1="26.2118" y1="16.7209" x2="26.2118" y2="30.8694" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3E3E3E"/>
+<stop offset="1" stop-color="#616161"/>
+</linearGradient>
+<linearGradient id="paint12_linear" x1="8.78767" y1="16.7209" x2="8.78767" y2="30.8694" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3E3E3E"/>
+<stop offset="1" stop-color="#616161"/>
+</linearGradient>
+<linearGradient id="paint13_linear" x1="17.4382" y1="4.12515" x2="17.4382" y2="34.1012" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FF60DC"/>
+<stop offset="1" stop-color="#6B71FF"/>
+</linearGradient>
+<radialGradient id="paint14_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(17.4382 3.50637) rotate(90) scale(28.876 32.3077)">
+<stop stop-color="#FF60DC"/>
+<stop offset="1" stop-color="#6B71FF"/>
+</radialGradient>
+<clipPath id="clip0">
+<rect width="35" height="32.5749" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/build-types/flask/images/logo/metamask-logo-horizontal-dark.svg b/app/build-types/flask/images/logo/metamask-logo-horizontal-dark.svg
new file mode 100644
index 000000000..c38ba8c45
--- /dev/null
+++ b/app/build-types/flask/images/logo/metamask-logo-horizontal-dark.svg
@@ -0,0 +1,116 @@
+<svg width="1532" height="247" viewBox="0 0 1532 247" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M148.354 134.603L152.72 74.4431L170.498 31.5908H94.5015L112.279 74.4431L116.645 134.603L117.997 153.579L118.101 200.289H146.898L147.002 153.579L148.354 134.603Z" fill="url(#paint0_linear)"/>
+<path d="M244.727 123.029L190.355 107.077L206.781 131.996L182.246 179.957L214.682 179.54H262.92L244.727 123.029Z" fill="url(#paint1_linear)"/>
+<path d="M74.6449 107.077L20.2726 123.029L2.18311 179.54H50.4216L82.7539 179.957L58.2188 131.996L74.6449 107.077Z" fill="url(#paint2_linear)"/>
+<path d="M153.76 164.735L146.899 200.289L151.889 203.729L182.246 179.957L183.182 156.081L153.76 164.735Z" fill="#ACACAC"/>
+<path d="M81.9224 156.081L82.7541 179.957L113.111 203.729L118.101 200.289L111.24 164.735L81.9224 156.081Z" fill="#ACACAC"/>
+<path d="M256.267 82.0553L265 39.5158L251.9 0L151.889 74.4441L189.211 108.017L244.727 123.031L256.683 108.955L251.485 105.202L259.802 97.5906L253.46 92.5859L261.777 86.2258L256.267 82.0553Z" fill="url(#paint3_linear)"/>
+<path d="M8.73266 82.0553L-0.000171178 39.5158L13.0991 0L113.111 74.4441L75.7884 108.017L20.2725 123.031L8.31682 108.955L13.5149 105.202L5.19795 97.5906L11.5396 92.5859L3.22265 86.2258L8.73266 82.0553Z" fill="url(#paint4_linear)"/>
+<path d="M58.2188 131.997L81.9222 156.082L82.7539 179.958L58.2188 131.997Z" fill="#8D8D8D"/>
+<path d="M206.781 131.997L182.246 179.958L183.181 156.082L206.781 131.997Z" fill="#8D8D8D"/>
+<path d="M187.132 220.935L151.889 203.731L154.696 226.774L154.384 236.47L187.132 220.935Z" fill="#FF9F5A"/>
+<path d="M77.8677 220.934L110.616 236.469L110.408 226.773L113.111 203.73L77.8677 220.934Z" fill="#FF9F5A"/>
+<path d="M214.682 179.542L187.132 220.935L246.079 237.2L262.921 179.542H214.682Z" fill="url(#paint5_linear)"/>
+<path d="M2.18311 179.542L18.921 237.2L77.8677 220.935L50.4216 179.542H2.18311Z" fill="url(#paint6_linear)"/>
+<path d="M13.0991 0L113.111 74.4441L97.4126 31.5918L13.0991 0Z" fill="#757575"/>
+<path d="M167.587 31.5918L151.889 74.4441L251.9 0L167.587 31.5918Z" fill="#757575"/>
+<path d="M74.6448 107.079L58.2188 131.998L116.646 134.604L113.111 74.4443L74.6448 107.079Z" fill="url(#paint7_linear)"/>
+<path d="M190.355 107.079L151.889 74.4443L148.354 134.604L206.781 131.998L190.355 107.079Z" fill="url(#paint8_linear)"/>
+<path d="M77.8677 220.934L113.111 203.731L82.7539 179.959L77.8677 220.934Z" fill="url(#paint9_linear)"/>
+<path d="M151.889 203.731L187.132 220.934L182.246 179.959L151.889 203.731Z" fill="url(#paint10_linear)"/>
+<path d="M182.246 179.958L187.132 220.934L214.682 179.541L182.246 179.958Z" fill="url(#paint11_linear)"/>
+<path d="M82.7539 179.958L77.8677 220.934L50.3177 179.541L82.7539 179.958Z" fill="url(#paint12_linear)"/>
+<path d="M206.781 131.997L148.354 134.604L153.761 164.736L162.389 146.594L183.182 156.082L206.781 131.997Z" fill="#666666"/>
+<path d="M81.9222 156.082L102.611 146.594L111.24 164.736L116.646 134.604L58.2188 131.997L81.9222 156.082Z" fill="#666666"/>
+<path d="M153.76 164.736L147.002 153.579L148.354 134.604L153.76 164.736Z" fill="#8D8D8D"/>
+<path d="M111.24 164.736L116.646 134.604L117.997 153.579L111.24 164.736Z" fill="#8D8D8D"/>
+<path d="M147.003 153.58L153.76 164.736L146.899 200.29L147.003 153.58Z" fill="#8D8D8D"/>
+<path d="M117.997 153.58L118.101 200.29L111.24 164.736L117.997 153.58Z" fill="#8D8D8D"/>
+<path d="M154.571 236.345L154.696 226.773L152.097 224.48H112.903L110.408 226.773L110.616 236.47L77.8677 220.935L89.3035 230.318L112.591 246.479H152.409L175.696 230.318L187.132 220.935L154.571 236.345Z" fill="#DF7554"/>
+<path d="M151.889 203.731L146.899 200.29H118.101L113.111 203.731L110.408 226.773L112.903 224.479H152.097L154.696 226.773L151.889 203.731Z" fill="#161616" stroke="#161616" stroke-width="0.0657594" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M162.389 146.594L153.76 164.736L183.182 156.082L162.389 146.594Z" fill="#161616"/>
+<path d="M102.611 146.594L111.24 164.736L81.9224 156.082L102.611 146.594Z" fill="#161616"/>
+<path d="M256.683 108.955L251.485 105.202L259.802 97.5905L253.46 92.5859L261.777 86.2258L256.267 82.0553L265 39.5158L251.901 0L167.587 31.5918H97.4127L13.0993 0L0 39.5158L8.8368 82.0553L3.22283 86.2258L11.5398 92.5859L5.19812 97.5905L13.5151 105.202L8.31699 108.955L20.2727 123.031L2.18321 179.542L18.9211 237.199L77.8678 220.934L113.111 203.731L110.231 227.044L112.903 224.583L152.097 224.479L154.696 226.773L151.889 203.731L187.132 220.934L246.079 237.199L262.921 179.542L244.727 123.031L256.683 108.955Z" fill="url(#paint13_linear)" fill-opacity="0.1" style="mix-blend-mode:color-dodge"/>
+<path d="M256.683 108.955L251.485 105.202L259.802 97.5905L253.46 92.5859L261.777 86.2258L256.267 82.0553L265 39.5158L251.901 0L167.587 31.5918H97.4127L13.0993 0L0 39.5158L8.8368 82.0553L3.22283 86.2258L11.5398 92.5859L5.19812 97.5905L13.5151 105.202L8.31699 108.955L20.2727 123.031L2.18321 179.542L18.9211 237.199L77.8678 220.934L113.111 203.731L117.997 200.186H125.275H139.829H147.107L151.889 203.731L187.132 220.934L246.079 237.199L262.921 179.542L244.727 123.031L256.683 108.955Z" fill="url(#paint14_radial)" style="mix-blend-mode:overlay"/>
+</g>
+<path d="M1166.17 120.732C1159.42 116.127 1151.72 112.742 1144.35 108.759C1139.75 106.295 1134.84 103.855 1130.83 100.47C1124.08 94.944 1125.3 83.5933 1132.67 78.6647C1143.11 71.9189 1160.02 75.603 1161.86 89.7167C1161.86 90.0154 1162.16 90.339 1162.48 90.339H1178.15C1178.44 90.339 1178.77 90.0403 1178.77 89.7167C1177.85 79.8844 1174.16 71.9189 1167.41 66.6916C1160.94 61.763 1153.27 59 1145.27 59C1104.11 59 1100.42 102.611 1122.54 116.426C1125 117.969 1146.82 129.021 1154.49 133.626C1162.16 138.53 1164.62 147.143 1161.24 153.888C1158.17 160.335 1150.18 164.318 1142.48 164.019C1133.89 163.721 1127.12 158.792 1124.98 151.424C1124.68 150.204 1124.36 147.74 1124.36 146.52C1124.36 146.222 1124.06 145.898 1123.73 145.898H1106.85C1106.55 145.898 1106.23 146.197 1106.23 146.52C1106.23 158.792 1109.29 165.563 1117.58 171.711C1125.25 177.536 1133.87 180 1142.78 180C1165.82 180 1177.8 166.807 1180.26 153.291C1182.13 140.372 1178.14 128.399 1166.17 120.732Z" fill="#24292E"/>
+<path d="M433.192 61.4634H425.522H417.229C416.931 61.4634 416.607 61.7621 416.607 61.7621L402.786 107.514C402.487 108.136 401.865 108.136 401.566 107.514L388.044 61.7621C388.044 61.4634 387.745 61.4634 387.421 61.4634H379.129H371.758H361.623C361.299 61.4634 361 61.7621 361 62.0608V178.754C361 179.053 361.299 179.377 361.623 179.377H378.506C378.805 179.377 379.129 179.078 379.129 178.754V90.0145C379.129 89.3922 380.05 89.0935 380.349 89.7158L394.469 135.766L395.39 138.828C395.39 139.126 395.689 139.126 396.013 139.126H408.912C409.211 139.126 409.535 138.828 409.535 138.828L410.456 135.766L424.576 89.7158C424.576 89.0935 425.497 89.4171 425.497 90.0145V178.754C425.497 179.053 425.796 179.377 426.12 179.377H443.003C443.302 179.377 443.626 179.078 443.626 178.754V62.0608C443.626 61.7621 443.327 61.4385 443.003 61.4385L433.192 61.4634Z" fill="#24292E"/>
+<path d="M907.506 61.4634C907.207 61.4634 906.883 61.7621 906.883 61.7621L893.063 107.514C892.764 108.136 892.141 108.136 891.842 107.514L878.022 61.7621C878.022 61.4634 877.723 61.4634 877.399 61.4634H851.6C851.301 61.4634 850.978 61.7621 850.978 62.0857V178.779C850.978 179.078 851.276 179.402 851.6 179.402H868.484C868.783 179.402 869.106 179.103 869.106 178.779V90.0145C869.106 89.3922 870.028 89.0935 870.327 89.7158L884.446 135.766L885.368 138.828C885.368 139.126 885.667 139.126 885.99 139.126H898.89C899.189 139.126 899.512 138.828 899.512 138.828L900.434 135.766L914.553 89.7158C914.852 89.0935 915.773 89.0935 915.773 90.0145V178.754C915.773 179.053 916.072 179.377 916.396 179.377H933.28C933.579 179.377 933.902 179.078 933.902 178.754V62.0608C933.902 61.7621 933.604 61.4385 933.28 61.4385L907.506 61.4634Z" fill="#24292E"/>
+<path d="M690.01 61.4648H658.359H641.475H610.148C609.849 61.4648 609.525 61.7635 609.525 62.0871V76.5245C609.525 76.8232 609.824 77.1468 610.148 77.1468H640.877V178.482C640.877 178.781 641.176 179.104 641.5 179.104H658.384C658.683 179.104 659.006 178.806 659.006 178.482V77.1219H689.711C690.01 77.1219 690.333 76.8232 690.333 76.4996V62.0623C690.632 61.7635 690.309 61.4648 690.01 61.4648Z" fill="#24292E"/>
+<path d="M789.545 179.377H804.91C805.208 179.377 805.532 179.078 805.532 178.456L773.582 61.4637C773.582 61.165 773.284 61.165 772.96 61.165H767.133H756.699H751.17C750.872 61.165 750.548 61.4637 750.548 61.4637L718.897 178.456C718.897 178.755 719.196 179.377 719.52 179.377H734.884C735.183 179.377 735.507 179.078 735.507 179.078L744.721 145.001C744.721 144.703 745.02 144.703 745.343 144.703H779.435C779.733 144.703 780.057 145.001 780.057 145.001L789.271 179.078C788.922 179.054 789.246 179.377 789.545 179.377ZM749.004 127.776L761.281 82.3232C761.58 81.7009 762.202 81.7009 762.501 82.3232L774.778 127.776C774.778 128.075 774.479 128.697 774.155 128.697H749.577C749.303 128.398 749.004 128.1 749.004 127.776Z" fill="#24292E"/>
+<path d="M1051.59 179.377H1066.96C1067.26 179.377 1067.58 179.078 1067.58 178.456L1035.63 61.4637C1035.63 61.165 1035.33 61.165 1035.01 61.165H1029.18H1018.75H1012.92C1012.62 61.165 1012.3 61.4637 1012.3 61.4637L980.646 178.456C980.646 178.755 980.944 179.377 981.268 179.377H996.633C996.932 179.377 997.255 179.078 997.255 179.078L1006.47 145.001C1006.47 144.703 1006.77 144.703 1007.09 144.703H1041.18C1041.48 144.703 1041.81 145.001 1041.81 145.001L1051.02 179.078C1050.97 179.054 1051.27 179.377 1051.59 179.377ZM1011.03 127.776L1023.3 82.3232C1023.6 81.7009 1024.22 81.7009 1024.52 82.3232L1036.8 127.776C1036.8 128.075 1036.5 128.697 1036.18 128.697H1011.6C1011.35 128.398 1011.03 128.1 1011.03 127.776Z" fill="#24292E"/>
+<path d="M512.132 162.176V125.934C512.132 125.635 512.431 125.311 512.755 125.311H557.604C557.903 125.311 558.227 125.013 558.227 124.689V110.252C558.227 109.953 557.928 109.629 557.604 109.629H512.755C512.456 109.629 512.132 109.331 512.132 109.007V77.7427C512.132 77.444 512.431 77.1204 512.755 77.1204H563.755C564.054 77.1204 564.377 76.8217 564.377 76.4981V62.0608C564.377 61.7621 564.079 61.4385 563.755 61.4385H512.132H494.626C494.327 61.4385 494.003 61.7372 494.003 62.0608V77.0955V109.331V124.988V162.45V178.406C494.003 178.705 494.302 179.028 494.626 179.028H512.132H566.195C566.494 179.028 566.818 178.73 566.818 178.406V163.048C566.818 162.749 566.519 162.425 566.195 162.425H512.755C512.456 162.799 512.132 162.475 512.132 162.176Z" fill="#24292E"/>
+<path d="M1320.39 178.132L1262.02 117.645C1261.72 117.346 1261.72 117.022 1262.02 116.724L1314.54 62.3844C1314.83 62.0857 1314.54 61.4634 1314.24 61.4634H1292.72C1292.42 61.4634 1292.42 61.4634 1292.42 61.7621L1247.87 108.136C1247.57 108.435 1246.95 108.136 1246.95 107.837V62.0608C1246.95 61.7621 1246.65 61.4385 1246.33 61.4385H1229.44C1229.15 61.4385 1228.82 61.7372 1228.82 62.0608V178.754C1228.82 179.053 1229.12 179.377 1229.44 179.377H1246.33C1246.63 179.377 1246.95 179.078 1246.95 178.754V127.178C1246.95 126.556 1247.57 126.257 1247.87 126.88L1298.25 179.078L1298.55 179.377H1320.06C1320.69 179.377 1320.99 178.754 1320.39 178.132Z" fill="#24292E"/>
+<rect x="1338" y="27" width="194" height="84" rx="12" fill="#24292E"/>
+<path d="M1358 50.6376H1380.89V58.7139H1366.33V65.515H1377.7V73.5913H1366.33V88.3624H1358V50.6376Z" fill="white"/>
+<path d="M1386.55 50.6376H1394.87V80.2861H1410.28V88.3624H1386.55V50.6376Z" fill="white"/>
+<path d="M1427.39 50.6376H1434.94L1450.86 88.3624H1442.17L1438.87 80.3924H1423.46L1420.16 88.3624H1411.47L1427.39 50.6376ZM1426.45 73.0599H1435.83L1431.16 61.7425L1426.45 73.0599Z" fill="white"/>
+<path d="M1464.82 89C1461.85 89 1459.18 88.4155 1456.81 87.2466C1454.43 86.0422 1452.51 84.3774 1451.04 82.252L1457.43 76.7793C1458.34 78.1253 1459.51 79.188 1460.94 79.9673C1462.38 80.7112 1463.77 81.0831 1465.13 81.0831C1466.53 81.0831 1467.63 80.7997 1468.43 80.233C1469.24 79.6308 1469.64 78.8692 1469.64 77.9482C1469.64 76.9918 1469.24 76.1594 1468.43 75.451C1467.67 74.7425 1466.34 74.0695 1464.45 73.4319L1461.83 72.5286C1458.8 71.5014 1456.47 70.0845 1454.87 68.2779C1453.26 66.436 1452.46 64.2221 1452.46 61.6362C1452.46 59.7943 1452.77 58.1649 1453.4 56.748C1454.06 55.2956 1454.95 54.0736 1456.07 53.0817C1457.22 52.0899 1458.59 51.3283 1460.16 50.797C1461.73 50.2657 1463.44 50 1465.29 50C1467.56 50 1469.69 50.3896 1471.68 51.1689C1473.67 51.9482 1475.54 53.2943 1477.29 55.2071L1471.84 61.0518C1470.97 59.9891 1469.97 59.2098 1468.85 58.7139C1467.74 58.1826 1466.58 57.9169 1465.4 57.9169C1464.84 57.9169 1464.28 57.97 1463.72 58.0763C1463.2 58.1826 1462.73 58.3597 1462.31 58.6076C1461.89 58.8556 1461.54 59.1567 1461.26 59.5109C1461.01 59.8651 1460.89 60.2902 1460.89 60.7861C1460.89 61.8134 1461.35 62.6281 1462.25 63.2302C1463.2 63.797 1464.66 64.4346 1466.65 65.1431L1469.27 66.0995C1471.96 67.0913 1474.11 68.5082 1475.72 70.3501C1477.36 72.1921 1478.16 74.53 1478.13 77.3638C1478.13 79.064 1477.79 80.6403 1477.13 82.0926C1476.47 83.5095 1475.54 84.7316 1474.35 85.7589C1473.2 86.7861 1471.81 87.5831 1470.16 88.1499C1468.56 88.7166 1466.78 89 1464.82 89Z" fill="white"/>
+<path d="M1492.17 71.4659V88.3624H1483.9V50.6376H1492.17V66.4183L1504.8 50.6376H1515.01L1500.35 68.7561L1518 88.3624H1507.31L1492.17 71.4659Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear" x1="132.5" y1="31.5908" x2="132.5" y2="200.289" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8F8F8F"/>
+<stop offset="1" stop-color="#AEAEAE"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="222.583" y1="107.077" x2="222.583" y2="179.957" gradientUnits="userSpaceOnUse">
+<stop stop-color="#696969"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="42.4685" y1="107.077" x2="42.4685" y2="179.957" gradientUnits="userSpaceOnUse">
+<stop stop-color="#696969"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="184.533" y1="102.178" x2="279.867" y2="27.8973" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1B1B1B"/>
+<stop offset="1" stop-color="#565656"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="80.4668" y1="102.178" x2="-14.8672" y2="27.8973" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1B1B1B"/>
+<stop offset="1" stop-color="#565656"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="225.027" y1="179.542" x2="225.027" y2="237.2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#787878"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="40.0254" y1="179.542" x2="40.0254" y2="237.2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#787878"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="87.4322" y1="74.4443" x2="87.4322" y2="134.604" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7A7A"/>
+<stop offset="1" stop-color="#949494"/>
+</linearGradient>
+<linearGradient id="paint8_linear" x1="177.568" y1="74.4443" x2="177.568" y2="134.604" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7A7A"/>
+<stop offset="1" stop-color="#949494"/>
+</linearGradient>
+<linearGradient id="paint9_linear" x1="95.4893" y1="245.645" x2="95.4893" y2="-25.2885" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7C7D"/>
+<stop offset="1" stop-color="#CECECF"/>
+</linearGradient>
+<linearGradient id="paint10_linear" x1="169.51" y1="245.645" x2="169.51" y2="-25.2885" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7C7D"/>
+<stop offset="1" stop-color="#CECECF"/>
+</linearGradient>
+<linearGradient id="paint11_linear" x1="198.464" y1="126.784" x2="198.464" y2="234.065" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3E3E3E"/>
+<stop offset="1" stop-color="#616161"/>
+</linearGradient>
+<linearGradient id="paint12_linear" x1="66.5358" y1="126.784" x2="66.5358" y2="234.065" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3E3E3E"/>
+<stop offset="1" stop-color="#616161"/>
+</linearGradient>
+<linearGradient id="paint13_linear" x1="132.032" y1="31.279" x2="132.032" y2="258.573" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FF60DC"/>
+<stop offset="1" stop-color="#6B71FF"/>
+</linearGradient>
+<radialGradient id="paint14_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(132.032 26.5872) rotate(90) scale(218.953 244.615)">
+<stop stop-color="#FF60DC"/>
+<stop offset="1" stop-color="#6B71FF"/>
+</radialGradient>
+<clipPath id="clip0">
+<rect width="265" height="247" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/build-types/flask/images/logo/metamask-logo-horizontal.svg b/app/build-types/flask/images/logo/metamask-logo-horizontal.svg
new file mode 100644
index 000000000..450ac8434
--- /dev/null
+++ b/app/build-types/flask/images/logo/metamask-logo-horizontal.svg
@@ -0,0 +1,116 @@
+<svg width="1532" height="247" viewBox="0 0 1532 247" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M148.354 134.603L152.72 74.4431L170.498 31.5908H94.5015L112.279 74.4431L116.645 134.603L117.997 153.579L118.101 200.289H146.898L147.002 153.579L148.354 134.603Z" fill="url(#paint0_linear)"/>
+<path d="M244.727 123.029L190.355 107.077L206.781 131.996L182.246 179.957L214.682 179.54H262.92L244.727 123.029Z" fill="url(#paint1_linear)"/>
+<path d="M74.6449 107.077L20.2726 123.029L2.18311 179.54H50.4216L82.7539 179.957L58.2188 131.996L74.6449 107.077Z" fill="url(#paint2_linear)"/>
+<path d="M153.76 164.735L146.899 200.289L151.889 203.729L182.246 179.957L183.182 156.081L153.76 164.735Z" fill="#ACACAC"/>
+<path d="M81.9224 156.081L82.7541 179.957L113.111 203.729L118.101 200.289L111.24 164.735L81.9224 156.081Z" fill="#ACACAC"/>
+<path d="M256.267 82.0553L265 39.5158L251.9 0L151.889 74.4441L189.211 108.017L244.727 123.031L256.683 108.955L251.485 105.202L259.802 97.5906L253.46 92.5859L261.777 86.2258L256.267 82.0553Z" fill="url(#paint3_linear)"/>
+<path d="M8.73266 82.0553L-0.000171178 39.5158L13.0991 0L113.111 74.4441L75.7884 108.017L20.2725 123.031L8.31682 108.955L13.5149 105.202L5.19795 97.5906L11.5396 92.5859L3.22265 86.2258L8.73266 82.0553Z" fill="url(#paint4_linear)"/>
+<path d="M58.2188 131.997L81.9222 156.082L82.7539 179.958L58.2188 131.997Z" fill="#8D8D8D"/>
+<path d="M206.781 131.997L182.246 179.958L183.181 156.082L206.781 131.997Z" fill="#8D8D8D"/>
+<path d="M187.132 220.935L151.889 203.731L154.696 226.774L154.384 236.47L187.132 220.935Z" fill="#FF9F5A"/>
+<path d="M77.8677 220.934L110.616 236.469L110.408 226.773L113.111 203.73L77.8677 220.934Z" fill="#FF9F5A"/>
+<path d="M214.682 179.542L187.132 220.935L246.079 237.2L262.921 179.542H214.682Z" fill="url(#paint5_linear)"/>
+<path d="M2.18311 179.542L18.921 237.2L77.8677 220.935L50.4216 179.542H2.18311Z" fill="url(#paint6_linear)"/>
+<path d="M13.0991 0L113.111 74.4441L97.4126 31.5918L13.0991 0Z" fill="#757575"/>
+<path d="M167.587 31.5918L151.889 74.4441L251.9 0L167.587 31.5918Z" fill="#757575"/>
+<path d="M74.6448 107.079L58.2188 131.998L116.646 134.604L113.111 74.4443L74.6448 107.079Z" fill="url(#paint7_linear)"/>
+<path d="M190.355 107.079L151.889 74.4443L148.354 134.604L206.781 131.998L190.355 107.079Z" fill="url(#paint8_linear)"/>
+<path d="M77.8677 220.934L113.111 203.731L82.7539 179.959L77.8677 220.934Z" fill="url(#paint9_linear)"/>
+<path d="M151.889 203.731L187.132 220.934L182.246 179.959L151.889 203.731Z" fill="url(#paint10_linear)"/>
+<path d="M182.246 179.958L187.132 220.934L214.682 179.541L182.246 179.958Z" fill="url(#paint11_linear)"/>
+<path d="M82.7539 179.958L77.8677 220.934L50.3177 179.541L82.7539 179.958Z" fill="url(#paint12_linear)"/>
+<path d="M206.781 131.997L148.354 134.604L153.761 164.736L162.389 146.594L183.182 156.082L206.781 131.997Z" fill="#666666"/>
+<path d="M81.9222 156.082L102.611 146.594L111.24 164.736L116.646 134.604L58.2188 131.997L81.9222 156.082Z" fill="#666666"/>
+<path d="M153.76 164.736L147.002 153.579L148.354 134.604L153.76 164.736Z" fill="#8D8D8D"/>
+<path d="M111.24 164.736L116.646 134.604L117.997 153.579L111.24 164.736Z" fill="#8D8D8D"/>
+<path d="M147.003 153.58L153.76 164.736L146.899 200.29L147.003 153.58Z" fill="#8D8D8D"/>
+<path d="M117.997 153.58L118.101 200.29L111.24 164.736L117.997 153.58Z" fill="#8D8D8D"/>
+<path d="M154.571 236.345L154.696 226.773L152.097 224.48H112.903L110.408 226.773L110.616 236.47L77.8677 220.935L89.3035 230.318L112.591 246.479H152.409L175.696 230.318L187.132 220.935L154.571 236.345Z" fill="#DF7554"/>
+<path d="M151.889 203.731L146.899 200.29H118.101L113.111 203.731L110.408 226.773L112.903 224.479H152.097L154.696 226.773L151.889 203.731Z" fill="#161616" stroke="#161616" stroke-width="0.0657594" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M162.389 146.594L153.76 164.736L183.182 156.082L162.389 146.594Z" fill="#161616"/>
+<path d="M102.611 146.594L111.24 164.736L81.9224 156.082L102.611 146.594Z" fill="#161616"/>
+<path d="M256.683 108.955L251.485 105.202L259.802 97.5905L253.46 92.5859L261.777 86.2258L256.267 82.0553L265 39.5158L251.901 0L167.587 31.5918H97.4127L13.0993 0L0 39.5158L8.8368 82.0553L3.22283 86.2258L11.5398 92.5859L5.19812 97.5905L13.5151 105.202L8.31699 108.955L20.2727 123.031L2.18321 179.542L18.9211 237.199L77.8678 220.934L113.111 203.731L110.231 227.044L112.903 224.583L152.097 224.479L154.696 226.773L151.889 203.731L187.132 220.934L246.079 237.199L262.921 179.542L244.727 123.031L256.683 108.955Z" fill="url(#paint13_linear)" fill-opacity="0.1" style="mix-blend-mode:color-dodge"/>
+<path d="M256.683 108.955L251.485 105.202L259.802 97.5905L253.46 92.5859L261.777 86.2258L256.267 82.0553L265 39.5158L251.901 0L167.587 31.5918H97.4127L13.0993 0L0 39.5158L8.8368 82.0553L3.22283 86.2258L11.5398 92.5859L5.19812 97.5905L13.5151 105.202L8.31699 108.955L20.2727 123.031L2.18321 179.542L18.9211 237.199L77.8678 220.934L113.111 203.731L117.997 200.186H125.275H139.829H147.107L151.889 203.731L187.132 220.934L246.079 237.199L262.921 179.542L244.727 123.031L256.683 108.955Z" fill="url(#paint14_radial)" style="mix-blend-mode:overlay"/>
+</g>
+<path d="M1166.17 120.732C1159.42 116.127 1151.72 112.742 1144.35 108.759C1139.75 106.295 1134.84 103.855 1130.83 100.47C1124.08 94.944 1125.3 83.5933 1132.67 78.6647C1143.11 71.9189 1160.02 75.603 1161.86 89.7167C1161.86 90.0154 1162.16 90.339 1162.48 90.339H1178.15C1178.44 90.339 1178.77 90.0403 1178.77 89.7167C1177.85 79.8844 1174.16 71.9189 1167.41 66.6916C1160.94 61.763 1153.27 59 1145.27 59C1104.11 59 1100.42 102.611 1122.54 116.426C1125 117.969 1146.82 129.021 1154.49 133.626C1162.16 138.53 1164.62 147.143 1161.24 153.888C1158.17 160.335 1150.18 164.318 1142.48 164.019C1133.89 163.721 1127.12 158.792 1124.98 151.424C1124.68 150.204 1124.36 147.74 1124.36 146.52C1124.36 146.222 1124.06 145.898 1123.73 145.898H1106.85C1106.55 145.898 1106.23 146.197 1106.23 146.52C1106.23 158.792 1109.29 165.563 1117.58 171.711C1125.25 177.536 1133.87 180 1142.78 180C1165.82 180 1177.8 166.807 1180.26 153.291C1182.13 140.372 1178.14 128.399 1166.17 120.732Z" fill="white"/>
+<path d="M433.192 61.4634H425.522H417.229C416.931 61.4634 416.607 61.7621 416.607 61.7621L402.786 107.514C402.487 108.136 401.865 108.136 401.566 107.514L388.044 61.7621C388.044 61.4634 387.745 61.4634 387.421 61.4634H379.129H371.758H361.623C361.299 61.4634 361 61.7621 361 62.0608V178.754C361 179.053 361.299 179.377 361.623 179.377H378.506C378.805 179.377 379.129 179.078 379.129 178.754V90.0145C379.129 89.3922 380.05 89.0935 380.349 89.7158L394.469 135.766L395.39 138.828C395.39 139.126 395.689 139.126 396.013 139.126H408.912C409.211 139.126 409.535 138.828 409.535 138.828L410.456 135.766L424.576 89.7158C424.576 89.0935 425.497 89.4171 425.497 90.0145V178.754C425.497 179.053 425.796 179.377 426.12 179.377H443.003C443.302 179.377 443.626 179.078 443.626 178.754V62.0608C443.626 61.7621 443.327 61.4385 443.003 61.4385L433.192 61.4634Z" fill="white"/>
+<path d="M907.506 61.4634C907.207 61.4634 906.883 61.7621 906.883 61.7621L893.063 107.514C892.764 108.136 892.141 108.136 891.842 107.514L878.022 61.7621C878.022 61.4634 877.723 61.4634 877.399 61.4634H851.6C851.301 61.4634 850.978 61.7621 850.978 62.0857V178.779C850.978 179.078 851.276 179.402 851.6 179.402H868.484C868.783 179.402 869.106 179.103 869.106 178.779V90.0145C869.106 89.3922 870.028 89.0935 870.327 89.7158L884.446 135.766L885.368 138.828C885.368 139.126 885.667 139.126 885.99 139.126H898.89C899.189 139.126 899.512 138.828 899.512 138.828L900.434 135.766L914.553 89.7158C914.852 89.0935 915.773 89.0935 915.773 90.0145V178.754C915.773 179.053 916.072 179.377 916.396 179.377H933.28C933.579 179.377 933.902 179.078 933.902 178.754V62.0608C933.902 61.7621 933.604 61.4385 933.28 61.4385L907.506 61.4634Z" fill="white"/>
+<path d="M690.01 61.4648H658.359H641.475H610.148C609.849 61.4648 609.525 61.7635 609.525 62.0871V76.5245C609.525 76.8232 609.824 77.1468 610.148 77.1468H640.877V178.482C640.877 178.781 641.176 179.104 641.5 179.104H658.384C658.683 179.104 659.006 178.806 659.006 178.482V77.1219H689.711C690.01 77.1219 690.333 76.8232 690.333 76.4996V62.0623C690.632 61.7635 690.309 61.4648 690.01 61.4648Z" fill="white"/>
+<path d="M789.545 179.377H804.91C805.208 179.377 805.532 179.078 805.532 178.456L773.582 61.4637C773.582 61.165 773.284 61.165 772.96 61.165H767.133H756.699H751.17C750.872 61.165 750.548 61.4637 750.548 61.4637L718.897 178.456C718.897 178.755 719.196 179.377 719.52 179.377H734.884C735.183 179.377 735.507 179.078 735.507 179.078L744.721 145.001C744.721 144.703 745.02 144.703 745.343 144.703H779.435C779.733 144.703 780.057 145.001 780.057 145.001L789.271 179.078C788.922 179.054 789.246 179.377 789.545 179.377ZM749.004 127.776L761.281 82.3232C761.58 81.7009 762.202 81.7009 762.501 82.3232L774.778 127.776C774.778 128.075 774.479 128.697 774.155 128.697H749.577C749.303 128.398 749.004 128.1 749.004 127.776Z" fill="white"/>
+<path d="M1051.59 179.377H1066.96C1067.26 179.377 1067.58 179.078 1067.58 178.456L1035.63 61.4637C1035.63 61.165 1035.33 61.165 1035.01 61.165H1029.18H1018.75H1012.92C1012.62 61.165 1012.3 61.4637 1012.3 61.4637L980.646 178.456C980.646 178.755 980.944 179.377 981.268 179.377H996.633C996.932 179.377 997.255 179.078 997.255 179.078L1006.47 145.001C1006.47 144.703 1006.77 144.703 1007.09 144.703H1041.18C1041.48 144.703 1041.81 145.001 1041.81 145.001L1051.02 179.078C1050.97 179.054 1051.27 179.377 1051.59 179.377ZM1011.03 127.776L1023.3 82.3232C1023.6 81.7009 1024.22 81.7009 1024.52 82.3232L1036.8 127.776C1036.8 128.075 1036.5 128.697 1036.18 128.697H1011.6C1011.35 128.398 1011.03 128.1 1011.03 127.776Z" fill="white"/>
+<path d="M512.132 162.176V125.934C512.132 125.635 512.431 125.311 512.755 125.311H557.604C557.903 125.311 558.227 125.013 558.227 124.689V110.252C558.227 109.953 557.928 109.629 557.604 109.629H512.755C512.456 109.629 512.132 109.331 512.132 109.007V77.7427C512.132 77.444 512.431 77.1204 512.755 77.1204H563.755C564.054 77.1204 564.377 76.8217 564.377 76.4981V62.0608C564.377 61.7621 564.079 61.4385 563.755 61.4385H512.132H494.626C494.327 61.4385 494.003 61.7372 494.003 62.0608V77.0955V109.331V124.988V162.45V178.406C494.003 178.705 494.302 179.028 494.626 179.028H512.132H566.195C566.494 179.028 566.818 178.73 566.818 178.406V163.048C566.818 162.749 566.519 162.425 566.195 162.425H512.755C512.456 162.799 512.132 162.475 512.132 162.176Z" fill="white"/>
+<path d="M1320.39 178.132L1262.02 117.645C1261.72 117.346 1261.72 117.022 1262.02 116.724L1314.54 62.3844C1314.83 62.0857 1314.54 61.4634 1314.24 61.4634H1292.72C1292.42 61.4634 1292.42 61.4634 1292.42 61.7621L1247.87 108.136C1247.57 108.435 1246.95 108.136 1246.95 107.837V62.0608C1246.95 61.7621 1246.65 61.4385 1246.33 61.4385H1229.44C1229.15 61.4385 1228.82 61.7372 1228.82 62.0608V178.754C1228.82 179.053 1229.12 179.377 1229.44 179.377H1246.33C1246.63 179.377 1246.95 179.078 1246.95 178.754V127.178C1246.95 126.556 1247.57 126.257 1247.87 126.88L1298.25 179.078L1298.55 179.377H1320.06C1320.69 179.377 1320.99 178.754 1320.39 178.132Z" fill="white"/>
+<rect x="1338" y="27" width="194" height="84" rx="12" fill="#24292E"/>
+<path d="M1358 50.6376H1380.89V58.7139H1366.33V65.515H1377.7V73.5913H1366.33V88.3624H1358V50.6376Z" fill="white"/>
+<path d="M1386.55 50.6376H1394.87V80.2861H1410.28V88.3624H1386.55V50.6376Z" fill="white"/>
+<path d="M1427.39 50.6376H1434.94L1450.86 88.3624H1442.17L1438.87 80.3924H1423.46L1420.16 88.3624H1411.47L1427.39 50.6376ZM1426.45 73.0599H1435.83L1431.16 61.7425L1426.45 73.0599Z" fill="white"/>
+<path d="M1464.82 89C1461.85 89 1459.18 88.4155 1456.81 87.2466C1454.43 86.0422 1452.51 84.3774 1451.04 82.252L1457.43 76.7793C1458.34 78.1253 1459.51 79.188 1460.94 79.9673C1462.38 80.7112 1463.77 81.0831 1465.13 81.0831C1466.53 81.0831 1467.63 80.7997 1468.43 80.233C1469.24 79.6308 1469.64 78.8692 1469.64 77.9482C1469.64 76.9918 1469.24 76.1594 1468.43 75.451C1467.67 74.7425 1466.34 74.0695 1464.45 73.4319L1461.83 72.5286C1458.8 71.5014 1456.47 70.0845 1454.87 68.2779C1453.26 66.436 1452.46 64.2221 1452.46 61.6362C1452.46 59.7943 1452.77 58.1649 1453.4 56.748C1454.06 55.2956 1454.95 54.0736 1456.07 53.0817C1457.22 52.0899 1458.59 51.3283 1460.16 50.797C1461.73 50.2657 1463.44 50 1465.29 50C1467.56 50 1469.69 50.3896 1471.68 51.1689C1473.67 51.9482 1475.54 53.2943 1477.29 55.2071L1471.84 61.0518C1470.97 59.9891 1469.97 59.2098 1468.85 58.7139C1467.74 58.1826 1466.58 57.9169 1465.4 57.9169C1464.84 57.9169 1464.28 57.97 1463.72 58.0763C1463.2 58.1826 1462.73 58.3597 1462.31 58.6076C1461.89 58.8556 1461.54 59.1567 1461.26 59.5109C1461.01 59.8651 1460.89 60.2902 1460.89 60.7861C1460.89 61.8134 1461.35 62.6281 1462.25 63.2302C1463.2 63.797 1464.66 64.4346 1466.65 65.1431L1469.27 66.0995C1471.96 67.0913 1474.11 68.5082 1475.72 70.3501C1477.36 72.1921 1478.16 74.53 1478.13 77.3638C1478.13 79.064 1477.79 80.6403 1477.13 82.0926C1476.47 83.5095 1475.54 84.7316 1474.35 85.7589C1473.2 86.7861 1471.81 87.5831 1470.16 88.1499C1468.56 88.7166 1466.78 89 1464.82 89Z" fill="white"/>
+<path d="M1492.17 71.4659V88.3624H1483.9V50.6376H1492.17V66.4183L1504.8 50.6376H1515.01L1500.35 68.7561L1518 88.3624H1507.31L1492.17 71.4659Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear" x1="132.5" y1="31.5908" x2="132.5" y2="200.289" gradientUnits="userSpaceOnUse">
+<stop stop-color="#8F8F8F"/>
+<stop offset="1" stop-color="#AEAEAE"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="222.583" y1="107.077" x2="222.583" y2="179.957" gradientUnits="userSpaceOnUse">
+<stop stop-color="#696969"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="42.4685" y1="107.077" x2="42.4685" y2="179.957" gradientUnits="userSpaceOnUse">
+<stop stop-color="#696969"/>
+<stop offset="1" stop-color="#A6A6A6"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="184.533" y1="102.178" x2="279.867" y2="27.8973" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1B1B1B"/>
+<stop offset="1" stop-color="#565656"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="80.4668" y1="102.178" x2="-14.8672" y2="27.8973" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1B1B1B"/>
+<stop offset="1" stop-color="#565656"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="225.027" y1="179.542" x2="225.027" y2="237.2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#787878"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="40.0254" y1="179.542" x2="40.0254" y2="237.2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#787878"/>
+<stop offset="1" stop-color="#5E5E5E"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="87.4322" y1="74.4443" x2="87.4322" y2="134.604" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7A7A"/>
+<stop offset="1" stop-color="#949494"/>
+</linearGradient>
+<linearGradient id="paint8_linear" x1="177.568" y1="74.4443" x2="177.568" y2="134.604" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7A7A"/>
+<stop offset="1" stop-color="#949494"/>
+</linearGradient>
+<linearGradient id="paint9_linear" x1="95.4893" y1="245.645" x2="95.4893" y2="-25.2885" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7C7D"/>
+<stop offset="1" stop-color="#CECECF"/>
+</linearGradient>
+<linearGradient id="paint10_linear" x1="169.51" y1="245.645" x2="169.51" y2="-25.2885" gradientUnits="userSpaceOnUse">
+<stop stop-color="#7A7C7D"/>
+<stop offset="1" stop-color="#CECECF"/>
+</linearGradient>
+<linearGradient id="paint11_linear" x1="198.464" y1="126.784" x2="198.464" y2="234.065" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3E3E3E"/>
+<stop offset="1" stop-color="#616161"/>
+</linearGradient>
+<linearGradient id="paint12_linear" x1="66.5358" y1="126.784" x2="66.5358" y2="234.065" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3E3E3E"/>
+<stop offset="1" stop-color="#616161"/>
+</linearGradient>
+<linearGradient id="paint13_linear" x1="132.032" y1="31.279" x2="132.032" y2="258.573" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FF60DC"/>
+<stop offset="1" stop-color="#6B71FF"/>
+</linearGradient>
+<radialGradient id="paint14_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(132.032 26.5872) rotate(90) scale(218.953 244.615)">
+<stop stop-color="#FF60DC"/>
+<stop offset="1" stop-color="#6B71FF"/>
+</radialGradient>
+<clipPath id="clip0">
+<rect width="265" height="247" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/build-types/flask/manifest/_base.json b/app/build-types/flask/manifest/_base.json
new file mode 100644
index 000000000..d9c8ec220
--- /dev/null
+++ b/app/build-types/flask/manifest/_base.json
@@ -0,0 +1,26 @@
+{
+  "browser_action": {
+    "default_icon": {
+      "16": "images/icon-16.png",
+      "19": "images/icon-19.png",
+      "32": "images/icon-32.png",
+      "38": "images/icon-38.png",
+      "64": "images/icon-64.png",
+      "128": "images/icon-128.png",
+      "512": "images/icon-512.png"
+    },
+    "default_title": "MetaMask Flask"
+  },
+  "icons": {
+    "16": "images/icon-16.png",
+    "19": "images/icon-19.png",
+    "32": "images/icon-32.png",
+    "38": "images/icon-38.png",
+    "48": "images/icon-48.png",
+    "64": "images/icon-64.png",
+    "128": "images/icon-128.png",
+    "512": "images/icon-512.png"
+  },
+  "name": "__MSG_appName__ Flask",
+  "short_name": "__MSG_appName__ Flask"
+}
diff --git a/app/build-types/flask/manifest/firefox.json b/app/build-types/flask/manifest/firefox.json
new file mode 100644
index 000000000..7c8fb8f13
--- /dev/null
+++ b/app/build-types/flask/manifest/firefox.json
@@ -0,0 +1,7 @@
+{
+  "applications": {
+    "gecko": {
+      "id": "webextension-flask@metamask.io"
+    }
+  }
+}
diff --git a/app/images/caret-right.svg b/app/images/caret-right.svg
index b1a990ad1..1308f59ce 100644
--- a/app/images/caret-right.svg
+++ b/app/images/caret-right.svg
@@ -1,3 +1,3 @@
-<svg viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg">
-    <path d="M380.4 756.7c-4.5 0-9-1.7-12.4-5.1-6.8-6.8-6.8-17.9 0-24.7L594.9 500 368 273.2c-6.8-6.8-6.8-17.9 0-24.7s17.9-6.8 24.7 0L632 487.6c6.8 6.8 6.8 17.9 0 24.7L392.8 751.6c-3.5 3.4-7.9 5.1-12.4 5.1z" fill="#231f20"/>
+<svg viewBox="0 0 10 14" fill="#6A737D" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.90625 7.53125C9.1875 7.25 9.1875 6.78125 8.90625 6.5L2.84375 0.40625C2.53125 0.125 2.0625 0.125 1.78125 0.40625L1.0625 1.125C0.78125 1.40625 0.78125 1.875 1.0625 2.1875L5.875 7L1.0625 11.8438C0.78125 12.1562 0.78125 12.625 1.0625 12.9062L1.78125 13.625C2.0625 13.9062 2.53125 13.9062 2.84375 13.625L8.90625 7.53125Z" fill="#6A737D"/>
 </svg>
diff --git a/app/images/check_circle.svg b/app/images/check_circle.svg
new file mode 100644
index 000000000..514183743
--- /dev/null
+++ b/app/images/check_circle.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.75 8C15.75 3.75 12.25 0.25 8 0.25C3.71875 0.25 0.25 3.75 0.25 8C0.25 12.2812 3.71875 15.75 8 15.75C12.25 15.75 15.75 12.2812 15.75 8ZM7.09375 12.125C6.90625 12.3125 6.5625 12.3125 6.375 12.125L3.125 8.875C2.9375 8.6875 2.9375 8.34375 3.125 8.15625L3.84375 7.46875C4.03125 7.25 4.34375 7.25 4.53125 7.46875L6.75 9.65625L11.4375 4.96875C11.625 4.75 11.9375 4.75 12.125 4.96875L12.8438 5.65625C13.0312 5.84375 13.0312 6.1875 12.8438 6.375L7.09375 12.125Z" fill="#4CD964"/>
+</svg>
diff --git a/app/images/connect-lattice.svg b/app/images/connect-lattice.svg
new file mode 100644
index 000000000..b58f5845a
--- /dev/null
+++ b/app/images/connect-lattice.svg
@@ -0,0 +1,18 @@
+<svg width="213" height="78" viewBox="0 0 213 78" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M103.333 32L109.425 37.29L103.333 42.58M96 37.21H109.5" stroke="#3098DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M202.536 76.19H119.162C118.68 76.1892 118.203 76.0934 117.757 75.9082C117.312 75.7229 116.908 75.4517 116.568 75.1102C116.227 74.7686 115.958 74.3634 115.774 73.9176C115.59 73.4718 115.496 72.9942 115.497 72.512V4.677C115.496 4.19492 115.59 3.7174 115.774 3.27171C115.958 2.82602 116.228 2.42089 116.568 2.07945C116.908 1.73801 117.313 1.46695 117.758 1.28173C118.203 1.09652 118.68 1.00079 119.162 1H202.536C203.018 1.00066 203.495 1.0963 203.941 1.28147C204.386 1.46663 204.79 1.73769 205.13 2.07916C205.471 2.42063 205.74 2.82581 205.924 3.27156C206.108 3.7173 206.202 4.19488 206.201 4.677V72.512C206.202 72.9942 206.108 73.4719 205.924 73.9177C205.741 74.3636 205.471 74.7689 205.131 75.1105C204.79 75.4521 204.386 75.7232 203.941 75.9084C203.496 76.0937 203.018 76.1893 202.536 76.19Z" fill="#FEFEFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M202.536 76.19H119.162C118.68 76.1892 118.203 76.0934 117.757 75.9082C117.312 75.7229 116.908 75.4517 116.568 75.1102C116.227 74.7686 115.958 74.3634 115.774 73.9176C115.59 73.4718 115.496 72.9942 115.497 72.512V4.677C115.496 4.19492 115.59 3.7174 115.774 3.27171C115.958 2.82602 116.228 2.42089 116.568 2.07945C116.908 1.73801 117.313 1.46695 117.758 1.28173C118.203 1.09652 118.68 1.00079 119.162 1H202.536C203.018 1.00066 203.495 1.0963 203.941 1.28147C204.386 1.46663 204.79 1.73769 205.13 2.07916C205.471 2.42063 205.74 2.82581 205.924 3.27156C206.108 3.7173 206.202 4.19488 206.201 4.677V72.512C206.202 72.9942 206.108 73.4719 205.924 73.9177C205.741 74.3636 205.471 74.7689 205.131 75.1105C204.79 75.4521 204.386 75.7232 203.941 75.9084C203.496 76.0937 203.018 76.1893 202.536 76.19V76.19Z" stroke="#3098DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M210.706 76.63H111.222C111.061 76.6299 110.902 76.598 110.754 76.5363C110.605 76.4746 110.47 76.3842 110.357 76.2704C110.243 76.1565 110.153 76.0214 110.092 75.8727C110.031 75.724 110 75.5648 110 75.404V70.871C110 70.194 110.547 69.645 111.222 69.645H210.706C211.38 69.645 211.927 70.194 211.927 70.871V75.404C211.927 76.081 211.38 76.63 210.706 76.63Z" fill="#D9F0FF"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M210.706 76.63H111.222C111.061 76.6299 110.902 76.598 110.754 76.5363C110.605 76.4746 110.47 76.3842 110.357 76.2704C110.243 76.1565 110.153 76.0214 110.092 75.8727C110.031 75.724 110 75.5648 110 75.404V70.871C110 70.194 110.547 69.645 111.222 69.645H210.706C211.38 69.645 211.927 70.194 211.927 70.871V75.404C211.927 76.081 211.38 76.63 210.706 76.63Z" stroke="#3098DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M119.772 64.695H202.155V5.90302H119.772V64.695Z" fill="#FEFEFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M119.772 64.695H202.155V5.90302H119.772V64.695Z" stroke="#3098DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M163.433 52.476H158.382C158.294 52.4765 158.207 52.4496 158.135 52.399L155.146 50.307L153.832 49.221L146.537 51.249C146.427 51.2786 146.309 51.2638 146.21 51.2076C146.111 51.1515 146.037 51.0586 146.006 50.949L143.891 43.608C143.867 43.5246 143.868 43.4358 143.894 43.353L146.141 36.283L144.792 34.683C144.753 34.6369 144.724 34.5833 144.707 34.5255C144.69 34.4678 144.685 34.4071 144.692 34.3473C144.699 34.2875 144.719 34.2298 144.749 34.1778C144.78 34.1258 144.82 34.0806 144.869 34.045L145.111 33.869L144.437 33.249C144.391 33.2058 144.354 33.1532 144.33 33.0947C144.306 33.0363 144.295 32.9733 144.297 32.91C144.299 32.8468 144.315 32.7848 144.343 32.7282C144.372 32.6716 144.412 32.6217 144.461 32.582L144.841 32.281L144.221 31.804C144.168 31.7625 144.125 31.7092 144.096 31.6485C144.066 31.5877 144.051 31.521 144.052 31.4535C144.053 31.3861 144.069 31.3196 144.099 31.2594C144.129 31.1991 144.173 31.1466 144.227 31.106L144.682 30.766L143.602 25.529C143.586 25.4528 143.591 25.3737 143.616 25.3L145.262 20.299C145.28 20.2439 145.309 20.1929 145.348 20.1493C145.386 20.1056 145.433 20.0701 145.485 20.0448C145.537 20.0195 145.594 20.005 145.652 20.0021C145.71 19.9993 145.768 20.008 145.823 20.028L156.483 24.051H165.332L175.99 20.028C176.045 20.0072 176.103 19.9977 176.161 20.0001C176.22 20.0026 176.277 20.017 176.329 20.0423C176.382 20.0677 176.429 20.1036 176.467 20.1477C176.505 20.1918 176.534 20.2433 176.552 20.299L178.199 25.302C178.223 25.3749 178.227 25.4528 178.212 25.528L177.144 30.768L177.591 31.108C177.644 31.1493 177.686 31.202 177.716 31.2622C177.745 31.3224 177.761 31.3885 177.761 31.4555C177.761 31.5225 177.746 31.5887 177.717 31.6491C177.688 31.7094 177.646 31.7624 177.593 31.804L176.974 32.281L177.354 32.582C177.454 32.662 177.514 32.782 177.518 32.91C177.521 32.9731 177.509 33.036 177.485 33.0944C177.461 33.1528 177.424 33.2052 177.378 33.248L176.704 33.869L176.946 34.045C176.995 34.0805 177.036 34.1257 177.066 34.1777C177.097 34.2298 177.116 34.2876 177.123 34.3476C177.13 34.4075 177.125 34.4683 177.107 34.526C177.09 34.5837 177.06 34.6372 177.021 34.683L175.674 36.282L177.934 43.352C177.96 43.4348 177.961 43.5236 177.937 43.607L175.807 50.95C175.775 51.0591 175.702 51.1514 175.603 51.2073C175.504 51.2631 175.387 51.2781 175.277 51.249L167.982 49.221L166.628 50.337L163.678 52.399C163.606 52.4491 163.521 52.476 163.433 52.476Z" fill="#FEFEFE"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M163.433 52.476H158.382C158.294 52.4765 158.207 52.4496 158.135 52.399L155.146 50.307L153.832 49.221L146.537 51.249C146.427 51.2786 146.309 51.2638 146.21 51.2076C146.111 51.1515 146.037 51.0586 146.006 50.949L143.891 43.608C143.867 43.5246 143.868 43.4358 143.894 43.353L146.141 36.283L144.792 34.683C144.753 34.6369 144.724 34.5833 144.707 34.5255C144.69 34.4678 144.685 34.4071 144.692 34.3473C144.699 34.2875 144.719 34.2298 144.749 34.1778C144.78 34.1258 144.82 34.0806 144.869 34.045L145.111 33.869L144.437 33.249C144.391 33.2058 144.354 33.1532 144.33 33.0947C144.306 33.0363 144.295 32.9733 144.297 32.91C144.299 32.8468 144.315 32.7848 144.343 32.7282C144.372 32.6716 144.412 32.6217 144.461 32.582L144.841 32.281L144.221 31.804C144.168 31.7625 144.125 31.7092 144.096 31.6485C144.066 31.5877 144.051 31.521 144.052 31.4535C144.053 31.3861 144.069 31.3196 144.099 31.2594C144.129 31.1991 144.173 31.1466 144.227 31.106L144.682 30.766L143.602 25.529C143.586 25.4528 143.591 25.3737 143.616 25.3L145.262 20.299C145.28 20.2439 145.309 20.1929 145.348 20.1493C145.386 20.1056 145.433 20.0701 145.485 20.0448C145.537 20.0195 145.594 20.005 145.652 20.0021C145.71 19.9993 145.768 20.008 145.823 20.028L156.483 24.051H165.332L175.99 20.028C176.045 20.0072 176.103 19.9977 176.161 20.0001C176.22 20.0026 176.277 20.017 176.329 20.0423C176.382 20.0677 176.429 20.1036 176.467 20.1477C176.505 20.1918 176.534 20.2433 176.552 20.299L178.199 25.302C178.223 25.3749 178.227 25.4528 178.212 25.528L177.144 30.768L177.591 31.108C177.644 31.1493 177.686 31.202 177.716 31.2622C177.745 31.3224 177.761 31.3885 177.761 31.4555C177.761 31.5225 177.746 31.5887 177.717 31.6491C177.688 31.7094 177.646 31.7624 177.593 31.804L176.974 32.281L177.354 32.582C177.454 32.662 177.514 32.782 177.518 32.91C177.521 32.9731 177.509 33.036 177.485 33.0944C177.461 33.1528 177.424 33.2052 177.378 33.248L176.704 33.869L176.946 34.045C176.995 34.0805 177.036 34.1257 177.066 34.1777C177.097 34.2298 177.116 34.2876 177.123 34.3476C177.13 34.4075 177.125 34.4683 177.107 34.526C177.09 34.5837 177.06 34.6372 177.021 34.683L175.674 36.282L177.934 43.352C177.96 43.4348 177.961 43.5236 177.937 43.607L175.807 50.95C175.775 51.0591 175.702 51.1514 175.603 51.2073C175.504 51.2631 175.387 51.2781 175.277 51.249L167.982 49.221L166.628 50.337L163.678 52.399C163.606 52.4491 163.521 52.476 163.433 52.476V52.476Z" stroke="#3098DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M162.048 47.58H159.478L159.032 47.936L158.862 50.075H162.664L162.494 47.935L162.048 47.58ZM164.834 39.14L163.771 41.486C163.685 41.676 163.856 41.881 164.051 41.821L167.674 40.701C167.881 40.638 167.901 40.343 167.705 40.249L165.145 39.022C165.117 39.0089 165.087 39.0015 165.056 39.0003C165.025 38.9991 164.994 39.0041 164.965 39.015C164.936 39.0259 164.91 39.0425 164.888 39.0638C164.865 39.0851 164.847 39.1107 164.835 39.139L164.834 39.14ZM156.67 39.022L154.112 40.249C153.916 40.343 153.936 40.637 154.143 40.702L157.767 41.821C157.961 41.881 158.132 41.675 158.046 41.485L156.979 39.139C156.967 39.1107 156.949 39.0851 156.926 39.0638C156.904 39.0425 156.878 39.0259 156.849 39.015C156.82 39.0041 156.789 38.9991 156.758 39.0003C156.727 39.0015 156.697 39.0089 156.669 39.022" fill="#3098DC"/>
+<rect x="0.5" y="3.5" width="69" height="69" rx="8.5" stroke="#3098DC"/>
+<path d="M67.0547 23.8164C67.0547 22.4724 68.1442 21.3828 69.4883 21.3828C70.8323 21.3828 71.9219 22.4724 71.9219 23.8164V52.3242C71.9219 53.6683 70.8323 54.7578 69.4883 54.7578C68.1442 54.7578 67.0547 53.6683 67.0547 52.3242V23.8164Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M71.2266 52.3242V23.8164C71.2266 22.8564 70.4483 22.0781 69.4883 22.0781C68.5283 22.0781 67.75 22.8564 67.75 23.8164V52.3242C67.75 53.2842 68.5283 54.0625 69.4883 54.0625C70.4483 54.0625 71.2266 53.2842 71.2266 52.3242ZM69.4883 21.3828C68.1442 21.3828 67.0547 22.4724 67.0547 23.8164V52.3242C67.0547 53.6683 68.1442 54.7578 69.4883 54.7578C70.8323 54.7578 71.9219 53.6683 71.9219 52.3242V23.8164C71.9219 22.4724 70.8323 21.3828 69.4883 21.3828Z" fill="#3098DC"/>
+<path d="M70.25 25.3594H89.9141C90.79 25.3594 91.5 26.0694 91.5 26.9453V49.8906C91.5 50.7665 90.79 51.4766 89.9141 51.4766H70.25V25.3594Z" fill="#D8F0FE" stroke="#3098DC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M46 72L46 3L47 3L47 72L46 72Z" fill="#3098DC"/>
+<rect x="7" y="10" width="33" height="56" fill="#D8F0FE" stroke="#3098DC"/>
+</svg>
diff --git a/app/images/lattice-logo.png b/app/images/lattice-logo.png
new file mode 100644
index 000000000..0100aba0f
Binary files /dev/null and b/app/images/lattice-logo.png differ
diff --git a/app/images/no-nfts.svg b/app/images/no-nfts.svg
new file mode 100644
index 000000000..220eb4790
--- /dev/null
+++ b/app/images/no-nfts.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="76" height="76" fill="none">
+  <rect x="2" y="2" width="72" height="72" rx="36" fill="#fff" stroke="#BBC0C5" stroke-width="4" />
+  <path fill="url(#a)" fill-opacity=".28" d="M14 19h47v39H14z" />
+  <defs>
+    <pattern id="a" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#b" transform="matrix(.00178 0 0 .00215 -.002 0)" />
+    </pattern>
+    <image id="b" width="564" height="466" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAjQAAAHSCAYAAAD7flEBAAAgAElEQVR4Ae3dbW7dOrJG4Qyth5aZeWi52A1cwMg245Yp1peeAAESRVJRiy+r1vGf8+uPXwgggAACCCCAQHMCv5qv3/IRQAABBBBAAIE/hEYIEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYECE37LfQBCCCAAAIIIEBoZAABBBBAAAEE2hMgNO230AcggAACCCCAAKGRAQQQQAABBBBoT4DQtN9CH4AAAggggAAChEYGEEAAAQQQQKA9AULTfgt9AAIIIIAAAggQGhlAAAEEEEAAgfYE2gvNx8fHn9+/f4///frOJ/x6yn4+IbO+cV5fekofevXap+R30lxpLzT/+c9//vz69Wv876c0klcTecJ++sb5Z3biHr/O5xN+vfrtxP37+5te83PSL0LTRIYIjQH4dzPyd5mIzgChmZU5QlNM5/yEptiGbC7HT2hmNczogave2fwQmrN8o/NLaDYH1t2PE5q7iea+j9DMapjRDVq9s/khNGf5RueX0OTOu7fqhOYNSesLhGZWw4xu0OqdzQ+hOcs3Or+Epti4JDTFNmRzOYRmVsOMbtDqnc0PoTnLNzq/hGZzYN39OKG5m2ju+wjNrIYZ3aDVO5sfQnOWb3R+CU3uvHurTmjekLS+QGhmNczoBq3e2fwQmrN8o/NLaIqNS0JTbEM2l0NoZjXM6Aat3tn8EJqzfKPzS2g2B9bdjxOau4nmvo/QzGqY0Q1avbP5ITRn+Ubnl9Dkzru36oTmDUnrC4RmVsOMbtDqnc0PoTnLNzq/hKbYuCQ0xTZkczmEZlbDjG7Q6p3ND6E5yzc6v4Rmc2Dd/TihuZto7vsIzayGGd2g1TubH0Jzlm90fglN7rx7q05o3pC0vkBoZjXM6Aat3tn8EJqzfKPzS2iKjUtCU2xDNpdDaGY1zOgGrd7Z/BCas3yj80toNgfW3Y8TmruJ5r6P0MxqmNENWr2z+SE0Z/lG55fQ5M67t+qE5g1J6wuEZlbDjG7Q6p3ND6E5yzc6v4Sm2LgkNMU2ZHM5hGZWw4xu0OqdzQ+hOcs3Or+EZnNg3f04obmbaO77CM2shhndoNU7mx9Cc5ZvdH4JTe68e6tOaN6QtL5AaGY1zOgGrd7Z/BCas3yj80toio1LQlNsQzaXQ2hmNczoBq3e2fwQmrN8o/NLaDYH1t2PE5q7iea+j9DMapjRDVq9s/khNGf5RueX0OTOu7fqhOYNSesLhGZWw4xu0OqdzQ+hOcs3Or+Epti4JDTFNmRzOYRmVsOMbtDqnc0PoTnLNzq/hGZzYN39OKG5m2ju+wjNrIYZ3aDVO5sfQnOWb3R+CU3uvHurTmjekLS+QGhmNczoBq3e2fwQmrN8o/NLaIqNS0JTbEM2l0NoZjXM6Aat3tn8EJqzfKPzS2g2B9bdjxOau4nmvo/QzGqY0Q1avbP5ITRn+Ubnl9Dkzru36oTmDUnrC4RmVsOMbtDqnc0PoTnLNzq/hKbYuCQ0xTZkczmEZlbDjG7Q6p3ND6E5yzc6v4Rmc2Dd/TihuZto7vsIzayGGd2g1TubH0Jzlm90fglN7rx7q05o3pC0vkBoZjXM6Aat3tn8EJqzfKPzS2iKjUtCU2xDNpdDaGY1zOgGrd7Z/BCas3yj80toNgfW3Y8TmruJ5r6P0MxqmNENWr2z+SE0Z/lG55fQ5M67t+qE5g1J6wuEZlbDjG7Q6p3ND6E5yzc6v4Sm2LgkNMU2ZHM5hGZWw4xu0OqdzQ+hOcs3Or+EZnNg3f04obmbaO77CM2shhndoNU7mx9Cc5ZvdH4JTe68e6tOaN6QtL5AaGY1zOgGrd7Z/BCas3yj80toio1LQlNsQzaXQ2hmNczoBq3e2fwQmrN8o/NLaDYH1t2PE5q7iea+j9DMapjRDVq9s/khNGf5RueX0OTOu7fqhOYNSesLhGZWw4xu0OqdzQ+hOcs3Or+Epti4JDTFNmRzOYRmVsOMbtDqnc0PoTnLNzq/hGZzYN39OKG5m2ju+wjNrIYZ3aDVO5sfQnOWb3R+CU3uvHurTmjekLS+QGhmNczoBq3e2fwQmrN8o/NLaIqNS0JTbEM2l0NoZjXM6Aat3tn8EJqzfKPzS2g2B9bdjxOau4nmvo/QzGqY0Q1avbP5ITRn+Ubnl9Dkzru36oTmDUnrC4RmVsOMbtDqnc0PoTnLNzq/hKbYuCQ0xTZkczmEZlbDjG7Q6p3ND6E5yzc6v4Rmc2Dd/TihuZto7vsIzayGGd2g1TubH0Jzlm90fglN7rx7q05o3pC0vkBoZjXM6Aat3tn8EJqzfKPzS2iKjUtCU2xDNpdDaGY1zOgGrd7Z/BCas3yj80toNgfW3Y8TmruJ5r6P0MxqmNENWr2z+SE0Z/lG55fQ5M67t+qE5g1J6wuEZlbDjG7Q6p3ND6E5yzc6v4Sm2LgkNMU2ZHM5hGZWw4xu0OqdzQ+hOcs3Or+EZnNg3f04obmbaO77CM2shhndoNU7mx9Cc5ZvdH4JTe68e6tOaN6QtL5AaGY1zOgGrd7Z/BCas3yj80toio1LQlNsQzaXQ2hmNczoBq3e2fwQmrN8o/NLaDYH1t2Pvw7Ya1Om/35958fHx/jfhGZWw4xu0Oqdzc+rzz6lD02fKa/vmyaov+4WDO87Q+AVPs36bLPGF18ZkIFXBl791q9+BAhNkz0jNBqtYSsDMhCTAULTZDD+tUxC8xeQqn8lNDGNzMDAWQZkgNBUnYT/Xheh+TefMv9KaDRZg1YGZCAmA4SmzOi7tBBCcwlX3s2EJqaRGRg4y4AMEJq8WbdTmdDs0At8ltBosgatDMhATAYITeBwu7EUobkR5slXEZqYRmZg4CwDMkBoTk6zc+8mNOfY3vpmQqPJGrQyIAMxGSA0t46vsJcRmjDUe4UITUwjMzBwlgEZIDR78yrraUKTRf5iXUKjyRq0MiADMRkgNBcHVJHbCU2RjfhuGYQmppEZGDjLgAwQmu8mUs1/JzQ19+VtVYRGkzVoZUAGYjJAaN5GUIsLhKbFNv357/9bRDOLaWY44ywDz84AoWkyGP9aJqH5C0jVv/oJzbMbrAFr/2UgLgOEpuok/Pe6CM2/+ZT5V0IT18wMDqxl4NkZIDRlRt+lhRCaS7jybiY0z26wBqz9l4G4DBCavFm3U5nQ7NALfJbQxDUzgwNrGXh2BghN4HC7sRShuRHmyVcRmmc3WAPW/stAXAYIzclpdu7dhOYc21vfTGjimpnBgbUMPDsDhObW8RX2MkIThnqvEKF5doM1YO2/DMRlgNDszauspwlNFvmLdQlNXDMzOLCWgWdngNBcHFBFbic0RTbiu2UQmmc3WAPW/stAXAYIzXcTqea/E5qa+/K2KkIT18wMDqxl4NkZIDRvI6jFBULTYpv8rw8MmGcPGPtv/yMzQGiaDMa/lklo/gJS9a9+QqOhRzZ0teTtyRkgNFUn4b/XRWj+zafMvxIaA+bJA8a3y39kBghNmdF3aSGE5hKuvJsJjYYe2dDVkrcnZ4DQ5M26ncqEZode4LOExoB58oDx7fIfmQFCEzjcbixFaG6EefJVhEZDj2zoasnbkzNAaE5Os3PvJjTn2N76ZkJjwDx5wPh2+Y/MAKG5dXyFvYzQhKHeK0RoNPTIhq6WvD05A4Rmb15lPU1osshfrEtoDJgnDxjfLv+RGSA0FwdUkdsJTZGN+G4ZhEZDj2zoasnbkzNAaL6bSDX/ndDU3Je3VREaA+bJA8a3y39kBgjN2whqcYHQtNgm/+uDyGamluEpA8/OAKFpMhj/Wiah+QtI1b/6Cc2zG6wBa/9lIC4DhKbqJPz3ugjNv/mU+VdCE9fMDA6sZeDZGSA0ZUbfpYUQmku48m4mNM9usAas/ZeBuAwQmrxZt1OZ0OzQC3yW0MQ1M4MDaxl4dgYITeBwu7EUobkR5slXEZpnN1gD1v7LQFwGCM3JaXbu3YTmHNtb30xo4pqZwYG1DDw7A4Tm1vEV9jJCE4Z6rxCheXaDNWDtvwzEZYDQ7M2rrKcJTRb5i3UJTVwzMziwloFnZ4DQXBxQRW4nNEU24rtlEJpnN1gD1v7LQFwGCM13E6nmvxOamvvytipCE9fMDA6sZeDZGSA0byOoxQVC02Kb/K8PDJhnDxj7b/8jM0BomgzGv5ZJaP4CUvWvfkKjoUc2dLXk7ckZIDRVJ+G/10Vo/s2nzL8SGgPmyQPGt8t/ZAYITZnRd2khhOYSrrybCY2GHtnQ1ZK3J2eA0OTNup3KhGaHXuCzhMaAefKA8e3yH5kBQhM43G4sRWhuhHnyVYRGQ49s6GrJ25MzQGhOTrNz7yY059je+mZCY8A8ecD4dvmPzAChuXV8hb2M0ISh3itEaDT0yIaulrw9OQOEZm9eZT1NaLLIX6xLaAyYJw8Y3y7/kRkgNBcHVJHbCU2RjfhuGYRGQ49s6GrJ25MzQGi+m0g1/53Q1NyXt1URGgPmyQPGt8t/ZAYIzdsIanGB0LTYJv/rg8hmppbhKQPPzgChaTIY/1omofkLSNW/PuUnNK/vfMpvQ3PO0JTZOXv5Opev/fSrHwFC02TPXgfsCQPw9+/fTXZkb5kfHx+P2M8nZPb1jU/J7es7n7CnhGavv2U9TWiyyF+sS2guAit+O6GZ9V/0hGbWfhKa4g10sTxCswBT7TKhqbYje+shNLMGIKGZtZ+EZq+/ZT1NaLLIX6xLaC4CK347oZk1AAnNrP0kNMUb6GJ5hGYBptplQlNtR/bWQ2hmDUBCM2s/Cc1ef8t6mtBkkb9Yl9BcBFb8dkIzawASmln7SWiKN9DF8gjNAky1y4Sm2o7srYfQzBqAhGbWfhKavf6W9TShySJ/sS6huQis+O2EZtYAJDSz9pPQFG+gi+URmgWYapcJTbUd2VsPoZk1AAnNrP0kNHv9LetpQpNF/mJdQnMRWPHbCc2sAUhoZu0noSneQBfLIzQLMNUuE5pqO7K3HkIzawASmln7SWj2+lvW04Qmi/zFuoTmIrDitxOaWQOQ0MzaT0JTvIEulkdoFmCqXSY01XZkbz2EZtYAJDSz9pPQ7PW3rKcJTRb5i3UJzUVgxW8nNLMGIKGZtZ+EpngDXSyP0CzAVLtMaKrtyN56CM2sAUhoZu0nodnrb1lPE5os8hfrEpqLwIrfTmhmDUBCM2s/CU3xBrpYHqFZgKl2mdBU25G99RCaWQOQ0MzaT0Kz19+yniY0WeQv1iU0F4EVv53QzBqAhGbWfhKa4g10sTxCswBT7TKhqbYje+shNLMGIKGZtZ+EZq+/ZT1NaLLIX6xLaC4CK347oZk1AAnNrP0kNMUb6GJ5hGYBptplQlNtR/bWQ2hmDUBCM2s/Cc1ef8t6mtBkkb9Yl9BcBFb8dkIzawASmln7SWiKN9DF8gjNAky1y4Sm2o7srYfQzBqAhGbWfhKavf6W9TShySJ/sS6huQis+O2EZtYAJDSz9pPQFG+gi+URmgWYapcJTbUd2VsPoZk1AAnNrP0kNHv9LetpQpNF/mJdQnMRWPHbCc2sAUhoZu0noSneQBfLIzQLMNUuE5pqO7K3HkIzawASmln7SWj2+lvW04Qmi/zFuoTmIrDitxOaWQOQ0MzaT0JTvIEulkdoFmCqXSY01XZkbz2EZtYAJDSz9pPQ7PW3rKcJTRb5i3UJzUVgxW8nNLMGIKGZtZ+EpngDXSyP0CzAVLtMaKrtyN56CM2sAUhoZu0nodnrb1lPE5os8hfrEpqLwIrfTmhmDUBCM2s/CU3xBrpYHqFZgKl2mdBU25G99RCaWQOQ0MzaT0Kz19+yniY0WeQv1iU0F4EVv53QzBqAhGbWfhKa4g10sTxCswBT7TKhqbYje+shNLMGIKGZtZ+EZq+/ZT1NaLLIX6xLaC4CK347oZk1AAnNrP0kNMUb6GJ5hGYBptplQlNtR/bWQ2hmDUBCM2s/Cc1ef8t6mtBkkb9Yl9BcBFb8dkIzawASmln7SWiKN9DF8gjNAky1y4Sm2o7srYfQzBqAhGbWfhKavf6W9TShySJ/sS6huQis+O2EZtYAJDSz9pPQFG+gi+URmgWYapcJTbUd2VsPoZk1AAnNrP0kNHv9LetpQpNF/mJdQnMRWPHbCc2sAUhoZu0noSneQBfLIzQLMNUuE5pqO7K3HkIzawASmln7SWj2+lvW04Qmi/zFuoTmIrDitxOaWQOQ0MzaT0JTvIEulkdoFmCqXSY01XZkbz2EZtYAJDSz9pPQ7PW3rKcJTRb5i3UJzUVgxW8nNLMGIKGZtZ+EpngDXSyP0CzAVLtMaKrtyN56CM2sAUhoZu0nodnrb1lPE5os8hfrEpqLwIrfTmhmDUBCM2s/CU3xBrpYHqFZgKl2mdBU25G99RCaWQOQ0MzaT0Kz19+yniY0WeQv1iU0F4EVv53QzBqAhGbWfhKa4g10sTxCswBT7TKhqbYje+shNLMGIKGZtZ+EZq+/ZT1NaLLIX6xLaC4CK347oZk1AAnNrP0kNMUb6GJ5hGYBptplQlNtR/bWQ2hmDUBCM2s/Cc1ef8t6mtBkkb9Yl9BcBFb8dkIzawASmln7SWiKN9DF8gjNAky1y4Sm2o7srYfQzBqAhGbWfhKavf6W9TShySJ/sS6huQis+O2EZtYAJDSz9pPQFG+gi+URmgWYapcJTbUd2VsPoZk1AAnNrP0kNHv9LetpQpNF/mJdQnMRWPHbCc2sAUhoZu0noSneQBfLay80Txn0v37Nahi+x37KgAzIQG4GpokboSEKfzSV3KaCP/4yIAMZGSA0ix/1ZF32ExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TGo0goxGoKXcyIAPdM0BossxlUZfQaCrdm4r1y7AMyEBGBgjNQiyyLhMajSCjEagpdzIgA90zQGiyzGVRl9BoKt2bivXLsAzIQEYGCM1CLLIuExqNIKMRqCl3MiAD3TNAaLLMZVGX0Ggq3ZuK9cuwDMhARgYIzUIssi4TmlmN4Pfv338+Pj78xkAGCmZAv53VbwlNlrks6jpgsw7YS2j8QgCBmgRe5zPjJwlqnunzhKbYOSM0Z4Ke1UAITbEDZjkIfCJAaGb1W0LzKdwV/khoZh0wQlPhVFkDAl8TIDSz+i2h+TrnaVcJzawDRmjSjpLCCHxLgNDM6reE5tvIx95AaGYdMEITe35UQ+AKAUIzq98SmivpD7iX0Mw6YIQm4NAogcAPCRCaWf2W0PzwIJx6jNDMOmCE5tRJ8V4E9gkQmln9ltDsn4lb30BoZh0wQnPr8fAyBG4lQGhm9VtCc+vx2H8ZoZl1wAjN/pnwBgROESA0s/otoTl1Un74XkIz64ARmh8eBI8hEECA0Mzqt4Qm4NBcKUFoZh0wQnMl/e5FIJYAoZnVbwlN7Pn5thqhmXXACM23kXcDAmkECM2sfkto0o7S14UJzawDRmi+zrmrCFQgQGhm9VtCU+FUfVoDoZl1wAjNp3D7IwLFCBCaWf2W0BQ7YIRm1gEjNMUOmOUg8IkAoZnVbwnNp3BX+COhmXXACE2FU2UNCHxNgNDM6reE5uucp10lNLMOGKFJO0oKI/AtAUIzq98Smm8jH3sDoZl1wAhN7PlRDYErBAjNrH5LaK6kP+BeQjPrgBGagEOjBAI/JEBoZvVbQvPDg3DqMUIz64ARmlMnxXsR2CdAaGb1W0KzfyZufQOhmXXACM2tx8PLELiVAKGZ1W8Jza3HY/9lhGbWASM0+2fCGxA4RYDQzOq3hObUSfnhewnNrANGaH54EDyGQAABQjOr3xKagENzpQShmXXACM2V9LsXgVgChGZWvyU0sefn22qEZtYBIzTfRt4NCKQRIDSz+i2hSTtKXxcmNLMOGKH5OueuIlCBAKGZ1W8JTYVT9WkNhGbWASM0n8LtjwgUI0BoZvVbQlPsgBGaWQeM0BQ7YJaDwCcChGZWvyU0n8Jd4Y+EZtYBIzQVTpU1IPA1AUIzq98Smq9znnaV0Mw6YIQm7SgpjMC3BAjNrH5LaL6NfOwNhGbWASM0sedHNQSuECA0s/otobmS/oB7Cc2sA0ZoAg6NEgj8kAChmdVvCc0PD8KpxwjNrANGaE6dFO9FYJ8AoZnVbwnN/pm49Q2EZtYBIzS3Hg8vQ+BWAoRmVr8lNLcej/2XEZpZB4zQ7J8Jb0DgFAFCM6vfEppTJ+WH7yU0sw4YofnhQfAYAgEECM2sfktoAg7NlRKEZtYBIzRX0u9eBGIJEJpZ/ZbQxJ6fb6sRmlkHjNB8G3k3IJBGgNDM6reEJu0ofV2Y0Mw6YITm65y7ikAFAoRmVr8lNBVO1ac1EJpZB4zQfAq3PyJQjAChmdVvCU2xA0ZoZh0wQlPsgFkOAp8IEJpZ/ZbQfAp3hT8SmlkHjNBUOFXWgMDXBAjNrH5LaL7OedpVQjPrgBGatKOkMALfEiA0s/otofk28rE3EJpZB4zQxJ4f1RC4QoDQzOq3hOZK+gPuJTSzDhihCTg0SiDwQwKEZla/JTQ/PAinHiM0sw4YoTl1UrwXgX0ChGZWvyU0+2fi1jcQmlkHjNDcejy8DIFbCRCaWf2W0Nx6PPZfRmhmHTBCs38mvAGBUwQIzax+S2hOnZQfvpfQzDpghOaHB8FjCAQQIDSz+i2hCTg0V2mTMrgAAAjMSURBVEoQmlkHjNBcSb97EYglQGhm9VtCE3t+vq1GaGYdMELzbeTdgEAaAUIzq98SmrSj9HVhQjPrgBGar3PuKgIVCBCaWf2W0FQ4VZ/WQGhmHTBC8ync/ohAMQKEZla/JTTFDhihmXXACE2xA2Y5CHwiQGhm9VtC8yncFf5IaGYdMEJT4VRZAwJfEyA0s/otofk652lXCc2sA0Zo0o6Swgh8S4DQzOq3hObbyMfeQGhmHTBCE3t+VEPgCgFCM6vfEpor6Q+49+Pj488Tfj9J3F7fOv03cQtoDoElXvs5PbP//32/fs0a6l99z+tbnzBXXt846devSR8z+VteB+yrg+daz+b62k+/5hDwk4ue53DVP53PnmeT0DTZN0KjYTaJ6iOXSWicz0cGv9hHE5piG7JaDqHRMFfZcD2fAKFxPvNTaAWEpkkGCI2G2SSqj1wmoXE+Hxn8Yh9NaIptyGo5hEbDXGXD9XwChMb5zE+hFRCaJhkgNBpmk6g+cpmExvl8ZPCLfTShKbYhq+UQGg1zlQ3X8wkQGuczP4VWQGiaZIDQaJhNovrIZRIa5/ORwS/20YSm2IaslkNoNMxVNlzPJ0BonM/8FFoBoWmSAUKjYTaJ6iOXSWicz0cGv9hHE5piG7JaDqHRMFfZcD2fAKFxPvNTaAWEpkkGCI2G2SSqj1wmoXE+Hxn8Yh9NaIptyGo5hEbDXGXD9XwChMb5zE+hFRCaJhkgNBpmk6g+cpmExvl8ZPCLfTShKbYhq+UQGg1zlQ3X8wkQGuczP4VWQGiaZIDQaJhNovrIZRIa5/ORwS/20YSm2IaslkNoNMxVNlzPJ0BonM/8FFoBoWmSAUKjYTaJ6iOXSWicz0cGv9hHE5piG7JaDqHRMFfZcD2fAKFxPvNTaAWEpkkGCI2G2SSqj1wmoXE+Hxn8Yh9NaIptyGo5hEbDXGXD9XwChMb5zE+hFRCaJhkgNBpmk6g+cpmExvl8ZPCLfTShKbYhq+UQGg1zlQ3X8wkQGuczP4VWQGiaZIDQaJhNovrIZRIa5/ORwS/20YSm2IaslkNoNMxVNlzPJ0BonM/8FFoBoWmSAUKjYTaJ6iOXSWicz0cGv9hHE5piG7JaDqHRMFfZcD2fAKFxPvNTaAWEpkkGCI2G2SSqj1wmoXE+Hxn8Yh9NaIptyGo5hEbDXGXD9XwChMb5zE+hFRCaJhkgNBpmk6g+cpmExvl8ZPCLfTShKbYhq+UQGg1zlQ3X8wkQGuczP4VWQGiaZIDQaJhNovrIZRIa5/ORwS/20YSm2IaslkNoNMxVNlzPJ0BonM/8FFoBoWmSAUKjYTaJ6iOXSWicz0cGv9hHE5piG7JaDqHRMFfZcD2fAKFxPvNTaAWEpkkGCI2G2SSqj1wmoXE+Hxn8Yh9NaIptyGo5hEbDXGXD9XwChMb5zE+hFRCaJhkgNBpmk6g+cpmExvl8ZPCLfTShKbYhq+UQGg1zlQ3X8wkQGuczP4VWQGiaZIDQaJhNovrIZRIa5/ORwS/20YSm2IaslkNoNMxVNlzPJ0BonM/8FFoBoWmSAUKjYTaJ6iOXSWicz0cGv9hHE5piG7JaDqHRMFfZcD2fAKFxPvNTaAWEpkkGCI2G2SSqj1wmoXE+Hxn8Yh9NaIptyGo5hEbDXGXD9XwChMb5zE+hFRCaJhkgNBpmk6g+cpmExvl8ZPCLfTShKbYhq+UQGg1zlQ3X8wkQGuczP4VWQGiaZIDQaJhNovrIZRIa5/ORwS/20YSm2IaslkNoNMxVNlzPJ0BonM/8FFoBoWmSAUKjYTaJ6iOXSWicz0cGv9hHE5piG7JaDqHRMFfZcD2fAKFxPvNTaAWEpkkGCI2G2SSqj1wmoXE+Hxn8Yh9NaIptyGo5hEbDXGXD9XwChMb5zE+hFRCaJhkgNBpmk6g+cpmExvl8ZPCLfTShKbYhq+UQGg1zlQ3X8wkQGuczP4VWQGiaZIDQaJhNovrIZRIa5/ORwS/20YSm2IaslkNoNMxVNlzPJ0BonM/8FFoBoWmSgVfD9HsOg4+PjybJs8z/hcBrP51P5/N/yYp7zhEgNOfYejMCCCCAAAIIBBEgNEGglUEAAQQQQACBcwQIzTm23owAAggggAACQQQITRBoZRBAAAEEEEDgHAFCc46tNyOAAAIIIIBAEAFCEwRaGQQQQAABBBA4R4DQnGPrzQgggAACCCAQRIDQBIFWBgEEEEAAAQTOESA059h6MwIIIIAAAggEESA0QaCVQQABBBBAAIFzBAjNObbejAACCCCAAAJBBAhNEGhlEEAAAQQQQOAcAUJzjq03I4AAAggggEAQAUITBFoZBBBAAAEEEDhHgNCcY+vNCCCAAAIIIBBEgNAEgVYGAQQQQAABBM4RIDTn2HozAggggAACCAQRIDRBoJVBAAEEEEAAgXMECM05tt6MAAIIIIAAAkEECE0QaGUQQAABBBBA4BwBQnOOrTcjgAACCCCAQBABQhMEWhkEEEAAAQQQOEeA0Jxj680IIIAAAgggEESA0ASBVgYBBBBAAAEEzhEgNOfYejMCCCCAAAIIBBEgNEGglUEAAQQQQACBcwQIzTm23owAAggggAACQQQITRBoZRBAAAEEEEDgHAFCc46tNyOAAAIIIIBAEAFCEwRaGQQQQAABBBA4R4DQnGPrzQgggAACCCAQRIDQBIFWBgEEEEAAAQTOESA059h6MwIIIIAAAggEESA0QaCVQQABBBBAAIFzBAjNObbejAACCCCAAAJBBAhNEGhlEEAAAQQQQOAcAUJzjq03I4AAAggggEAQAUITBFoZBBBAAAEEEDhHgNCcY+vNCCCAAAIIIBBEgNAEgVYGAQQQQAABBM4RIDTn2HozAggggAACCAQRIDRBoJVBAAEEEEAAgXMECM05tt6MAAIIIIAAAkEECE0QaGUQQAABBBBA4BwBQnOOrTcjgAACCCCAQBABQhMEWhkEEEAAAQQQOEeA0Jxj680IIIAAAgggEETg/wDE+kTL/umDBwAAAABJRU5ErkJggg==" />
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/app/manifest/_base.json b/app/manifest/_base.json
index e4f55da26..bc63ce27d 100644
--- a/app/manifest/_base.json
+++ b/app/manifest/_base.json
@@ -66,6 +66,7 @@
     "clipboardWrite",
     "http://localhost:8545/",
     "https://*.infura.io/",
+    "https://wallet.gridplus.io/*",
     "activeTab",
     "webRequest",
     "*://*.eth/",
diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index 1539cbcba..28e84d7b0 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -7,6 +7,14 @@ import {
   METAMETRICS_BACKGROUND_PAGE_OBJECT,
 } from '../../../shared/constants/metametrics';
 
+const defaultCaptureException = (err) => {
+  // throw error on clean stack so its captured by platform integrations (eg sentry)
+  // but does not interupt the call stack
+  setTimeout(() => {
+    throw err;
+  });
+};
+
 /**
  * @typedef {import('../../../shared/constants/metametrics').MetaMetricsContext} MetaMetricsContext
  * @typedef {import('../../../shared/constants/metametrics').MetaMetricsEventPayload} MetaMetricsEventPayload
@@ -51,7 +59,9 @@ export default class MetaMetricsController {
     version,
     environment,
     initState,
+    captureException = defaultCaptureException,
   }) {
+    this._captureException = captureException;
     const prefState = preferencesStore.getState();
     this.chainId = getCurrentChainId();
     this.network = getNetworkIdentifier();
@@ -258,32 +268,52 @@ export default class MetaMetricsController {
    *  view
    */
   trackPage({ name, params, environmentType, page, referrer }, options) {
-    if (this.state.participateInMetaMetrics === false) {
-      return;
-    }
+    try {
+      if (this.state.participateInMetaMetrics === false) {
+        return;
+      }
 
-    if (this.state.participateInMetaMetrics === null && !options?.isOptInPath) {
-      return;
+      if (
+        this.state.participateInMetaMetrics === null &&
+        !options?.isOptInPath
+      ) {
+        return;
+      }
+      const { metaMetricsId } = this.state;
+      const idTrait = metaMetricsId ? 'userId' : 'anonymousId';
+      const idValue = metaMetricsId ?? METAMETRICS_ANONYMOUS_ID;
+      this.segment.page({
+        [idTrait]: idValue,
+        name,
+        properties: {
+          params,
+          locale: this.locale,
+          network: this.network,
+          chain_id: this.chainId,
+          environment_type: environmentType,
+        },
+        context: this._buildContext(referrer, page),
+      });
+    } catch (err) {
+      this._captureException(err);
     }
-    const { metaMetricsId } = this.state;
-    const idTrait = metaMetricsId ? 'userId' : 'anonymousId';
-    const idValue = metaMetricsId ?? METAMETRICS_ANONYMOUS_ID;
-    this.segment.page({
-      [idTrait]: idValue,
-      name,
-      properties: {
-        params,
-        locale: this.locale,
-        network: this.network,
-        chain_id: this.chainId,
-        environment_type: environmentType,
-      },
-      context: this._buildContext(referrer, page),
-    });
   }
 
   /**
-   * track a metametrics event, performing necessary payload manipulation and
+   * submits a metametrics event, not waiting for it to complete or allowing its error to bubble up
+   * @param {MetaMetricsEventPayload} payload - details of the event
+   * @param {MetaMetricsEventOptions} [options] - options for handling/routing the event
+   */
+  trackEvent(payload, options) {
+    // validation is not caught and handled
+    this.validatePayload(payload);
+    this.submitEvent(payload, options).catch((err) =>
+      this._captureException(err),
+    );
+  }
+
+  /**
+   * submits (or queues for submission) a metametrics event, performing necessary payload manipulation and
    * routing the event to the appropriate segment source. Will split events
    * with sensitiveProperties into two events, tracking the sensitiveProperties
    * with the anonymousId only.
@@ -291,21 +321,8 @@ export default class MetaMetricsController {
    * @param {MetaMetricsEventOptions} [options] - options for handling/routing the event
    * @returns {Promise<void>}
    */
-  async trackEvent(payload, options) {
-    // event and category are required fields for all payloads
-    if (!payload.event || !payload.category) {
-      throw new Error(
-        `Must specify event and category. Event was: ${
-          payload.event
-        }. Category was: ${payload.category}. Payload keys were: ${Object.keys(
-          payload,
-        )}. ${
-          typeof payload.properties === 'object'
-            ? `Payload property keys were: ${Object.keys(payload.properties)}`
-            : ''
-        }`,
-      );
-    }
+  async submitEvent(payload, options) {
+    this.validatePayload(payload);
 
     if (!this.state.participateInMetaMetrics && !options?.isOptIn) {
       return;
@@ -345,4 +362,25 @@ export default class MetaMetricsController {
 
     await Promise.all(events);
   }
+
+  /**
+   * validates a metametrics event
+   * @param {MetaMetricsEventPayload} payload - details of the event
+   */
+  validatePayload(payload) {
+    // event and category are required fields for all payloads
+    if (!payload.event || !payload.category) {
+      throw new Error(
+        `Must specify event and category. Event was: ${
+          payload.event
+        }. Category was: ${payload.category}. Payload keys were: ${Object.keys(
+          payload,
+        )}. ${
+          typeof payload.properties === 'object'
+            ? `Payload property keys were: ${Object.keys(payload.properties)}`
+            : ''
+        }`,
+      );
+    }
+  }
 }
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index bb0d15bed..9918d6319 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -196,14 +196,14 @@ describe('MetaMetricsController', function () {
     });
   });
 
-  describe('trackEvent', function () {
+  describe('submitEvent', function () {
     it('should not track an event if user is not participating in metametrics', function () {
       const mock = sinon.mock(segment);
       const metaMetricsController = getMetaMetricsController({
         participateInMetaMetrics: false,
       });
       mock.expects('track').never();
-      metaMetricsController.trackEvent({
+      metaMetricsController.submitEvent({
         event: 'Fake Event',
         category: 'Unit Test',
         properties: {
@@ -230,7 +230,7 @@ describe('MetaMetricsController', function () {
             ...DEFAULT_EVENT_PROPERTIES,
           },
         });
-      metaMetricsController.trackEvent(
+      metaMetricsController.submitEvent(
         {
           event: 'Fake Event',
           category: 'Unit Test',
@@ -260,7 +260,7 @@ describe('MetaMetricsController', function () {
             ...DEFAULT_EVENT_PROPERTIES,
           },
         });
-      metaMetricsController.trackEvent(
+      metaMetricsController.submitEvent(
         {
           event: 'Fake Event',
           category: 'Unit Test',
@@ -289,7 +289,7 @@ describe('MetaMetricsController', function () {
             ...DEFAULT_EVENT_PROPERTIES,
           },
         });
-      metaMetricsController.trackEvent(
+      metaMetricsController.submitEvent(
         {
           event: 'Fake Event',
           category: 'Unit Test',
@@ -317,7 +317,7 @@ describe('MetaMetricsController', function () {
             ...DEFAULT_EVENT_PROPERTIES,
           },
         });
-      metaMetricsController.trackEvent({
+      metaMetricsController.submitEvent({
         event: 'Fake Event',
         category: 'Unit Test',
         properties: {
@@ -331,7 +331,7 @@ describe('MetaMetricsController', function () {
       const metaMetricsController = getMetaMetricsController();
       const flushStub = sinon.stub(segment, 'flush');
       const flushCalled = waitUntilCalled(flushStub, segment);
-      metaMetricsController.trackEvent(
+      metaMetricsController.submitEvent(
         {
           event: 'Fake Event',
           category: 'Unit Test',
@@ -344,13 +344,13 @@ describe('MetaMetricsController', function () {
     it('should throw if event or category not provided', function () {
       const metaMetricsController = getMetaMetricsController();
       assert.rejects(
-        () => metaMetricsController.trackEvent({ event: 'test' }),
+        () => metaMetricsController.submitEvent({ event: 'test' }),
         /Must specify event and category\./u,
         'must specify category',
       );
 
       assert.rejects(
-        () => metaMetricsController.trackEvent({ category: 'test' }),
+        () => metaMetricsController.submitEvent({ category: 'test' }),
         /Must specify event and category\./u,
         'must specify event',
       );
@@ -360,7 +360,7 @@ describe('MetaMetricsController', function () {
       const metaMetricsController = getMetaMetricsController();
       assert.rejects(
         () =>
-          metaMetricsController.trackEvent(
+          metaMetricsController.submitEvent(
             {
               event: 'Fake Event',
               category: 'Unit Test',
@@ -375,7 +375,7 @@ describe('MetaMetricsController', function () {
     it('should track sensitiveProperties in a separate, anonymous event', function () {
       const metaMetricsController = getMetaMetricsController();
       const spy = sinon.spy(segment, 'track');
-      metaMetricsController.trackEvent({
+      metaMetricsController.submitEvent({
         event: 'Fake Event',
         category: 'Unit Test',
         sensitiveProperties: { foo: 'bar' },
diff --git a/app/scripts/controllers/network/createInfuraClient.js b/app/scripts/controllers/network/createInfuraClient.js
index 772a9ebde..ff143bff8 100644
--- a/app/scripts/controllers/network/createInfuraClient.js
+++ b/app/scripts/controllers/network/createInfuraClient.js
@@ -1,10 +1,13 @@
 import { createScaffoldMiddleware, mergeMiddleware } from 'json-rpc-engine';
-import createBlockRefMiddleware from 'eth-json-rpc-middleware/block-ref';
-import createRetryOnEmptyMiddleware from 'eth-json-rpc-middleware/retryOnEmpty';
-import createBlockCacheMiddleware from 'eth-json-rpc-middleware/block-cache';
-import createInflightCacheMiddleware from 'eth-json-rpc-middleware/inflight-cache';
-import createBlockTrackerInspectorMiddleware from 'eth-json-rpc-middleware/block-tracker-inspector';
-import providerFromMiddleware from 'eth-json-rpc-middleware/providerFromMiddleware';
+import {
+  createBlockRefMiddleware,
+  createRetryOnEmptyMiddleware,
+  createBlockCacheMiddleware,
+  createInflightCacheMiddleware,
+  createBlockTrackerInspectorMiddleware,
+  providerFromMiddleware,
+} from 'eth-json-rpc-middleware';
+
 import createInfuraMiddleware from 'eth-json-rpc-infura';
 import { PollingBlockTracker } from 'eth-block-tracker';
 
diff --git a/app/scripts/controllers/network/createJsonRpcClient.js b/app/scripts/controllers/network/createJsonRpcClient.js
index 050430740..f4ca59157 100644
--- a/app/scripts/controllers/network/createJsonRpcClient.js
+++ b/app/scripts/controllers/network/createJsonRpcClient.js
@@ -1,10 +1,12 @@
 import { createAsyncMiddleware, mergeMiddleware } from 'json-rpc-engine';
-import createFetchMiddleware from 'eth-json-rpc-middleware/fetch';
-import createBlockRefRewriteMiddleware from 'eth-json-rpc-middleware/block-ref-rewrite';
-import createBlockCacheMiddleware from 'eth-json-rpc-middleware/block-cache';
-import createInflightMiddleware from 'eth-json-rpc-middleware/inflight-cache';
-import createBlockTrackerInspectorMiddleware from 'eth-json-rpc-middleware/block-tracker-inspector';
-import providerFromMiddleware from 'eth-json-rpc-middleware/providerFromMiddleware';
+import {
+  createFetchMiddleware,
+  createBlockRefRewriteMiddleware,
+  createBlockCacheMiddleware,
+  createInflightCacheMiddleware,
+  createBlockTrackerInspectorMiddleware,
+  providerFromMiddleware,
+} from 'eth-json-rpc-middleware';
 import { PollingBlockTracker } from 'eth-block-tracker';
 import { SECOND } from '../../../../shared/constants/time';
 
@@ -27,7 +29,7 @@ export default function createJsonRpcClient({ rpcUrl, chainId }) {
     createChainIdMiddleware(chainId),
     createBlockRefRewriteMiddleware({ blockTracker }),
     createBlockCacheMiddleware({ blockTracker }),
-    createInflightMiddleware(),
+    createInflightCacheMiddleware(),
     createBlockTrackerInspectorMiddleware({ blockTracker }),
     fetchMiddleware,
   ]);
diff --git a/app/scripts/controllers/network/createMetamaskMiddleware.js b/app/scripts/controllers/network/createMetamaskMiddleware.js
index c3803a061..cee6b9b95 100644
--- a/app/scripts/controllers/network/createMetamaskMiddleware.js
+++ b/app/scripts/controllers/network/createMetamaskMiddleware.js
@@ -1,5 +1,5 @@
 import { createScaffoldMiddleware, mergeMiddleware } from 'json-rpc-engine';
-import createWalletSubprovider from 'eth-json-rpc-middleware/wallet';
+import { createWalletMiddleware } from 'eth-json-rpc-middleware';
 import {
   createPendingNonceMiddleware,
   createPendingTxMiddleware,
@@ -21,11 +21,10 @@ export default function createMetamaskMiddleware({
 }) {
   const metamaskMiddleware = mergeMiddleware([
     createScaffoldMiddleware({
-      // staticSubprovider
       eth_syncing: false,
       web3_clientVersion: `MetaMask/v${version}`,
     }),
-    createWalletSubprovider({
+    createWalletMiddleware({
       getAccounts,
       processTransaction,
       processEthSignMessage,
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 543649d35..d581c9581 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -2,7 +2,7 @@ import { strict as assert } from 'assert';
 import EventEmitter from 'events';
 import { ComposedStore, ObservableStore } from '@metamask/obs-store';
 import { JsonRpcEngine } from 'json-rpc-engine';
-import providerFromEngine from 'eth-json-rpc-middleware/providerFromEngine';
+import { providerFromEngine } from 'eth-json-rpc-middleware';
 import log from 'loglevel';
 import {
   createSwappableProxy,
diff --git a/app/scripts/controllers/network/pending-middleware.test.js b/app/scripts/controllers/network/pending-middleware.test.js
index ca97063b7..0c8d9bc04 100644
--- a/app/scripts/controllers/network/pending-middleware.test.js
+++ b/app/scripts/controllers/network/pending-middleware.test.js
@@ -1,5 +1,6 @@
 import { strict as assert } from 'assert';
 import { GAS_LIMITS } from '../../../../shared/constants/gas';
+import { TRANSACTION_ENVELOPE_TYPES } from '../../../../shared/constants/transaction';
 import { txMetaStub } from '../../../../test/stub/tx-meta-stub';
 import {
   createPendingNonceMiddleware,
@@ -63,7 +64,7 @@ describe('PendingNonceMiddleware', function () {
         '0x2cc5a25744486f7383edebbf32003e5a66e18135799593d6b5cdd2bb43674f09',
       input: '0x',
       nonce: '0x4',
-      type: '0x0',
+      type: TRANSACTION_ENVELOPE_TYPES.LEGACY,
       to: '0xf231d46dd78806e1dd93442cf33c7671f8538748',
       transactionIndex: null,
       value: '0x0',
diff --git a/app/scripts/controllers/network/util.test.js b/app/scripts/controllers/network/util.test.js
index f8e03ff0f..a1b7097b8 100644
--- a/app/scripts/controllers/network/util.test.js
+++ b/app/scripts/controllers/network/util.test.js
@@ -2,7 +2,9 @@ import { strict as assert } from 'assert';
 import {
   TRANSACTION_STATUSES,
   TRANSACTION_TYPES,
+  TRANSACTION_ENVELOPE_TYPES,
 } from '../../../../shared/constants/transaction';
+
 import { formatTxMetaForRpcResult } from './util';
 
 describe('network utils', function () {
@@ -92,7 +94,7 @@ describe('network utils', function () {
         s: '0x18bfc4eeb7ebcfacc3bd59ea100a6834ea3265e65945dbec69aa2a06564fafff',
         to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
         transactionIndex: null,
-        type: '0x0',
+        type: TRANSACTION_ENVELOPE_TYPES.LEGACY,
         v: '0x29',
         value: '0x0',
       };
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 41630cce3..a53cf8993 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -37,6 +37,7 @@ 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,
+      advancedGasFee: null,
 
       // WARNING: Do not use feature flags for security-sensitive things.
       // Feature flag toggling is available in the global namespace
@@ -53,6 +54,7 @@ export default class PreferencesController {
       preferences: {
         autoLockTimeLimit: undefined,
         showFiatInTestnets: false,
+        showTestNetworks: false,
         useNativeCurrencyAsPrimaryCurrency: true,
         hideZeroBalanceTokens: false,
       },
@@ -128,6 +130,16 @@ export default class PreferencesController {
     this.store.updateState({ useTokenDetection: val });
   }
 
+  /**
+   * Setter for the `advancedGasFee` property
+   *
+   * @param {object} val - holds the maxBaseFee and PriorityFee that the user set as default advanced settings.
+   *
+   */
+  setAdvancedGasFee(val) {
+    this.store.updateState({ advancedGasFee: val });
+  }
+
   /**
    * Add new methodData to state, to avoid requesting this information again through Infura
    *
diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js
index 51277bce2..bce64e1a9 100644
--- a/app/scripts/controllers/preferences.test.js
+++ b/app/scripts/controllers/preferences.test.js
@@ -266,4 +266,28 @@ describe('preferences controller', function () {
       );
     });
   });
+
+  describe('setAdvancedGasFee', function () {
+    it('should default to null', function () {
+      const state = preferencesController.store.getState();
+      assert.equal(state.advancedGasFee, null);
+    });
+
+    it('should set the setAdvancedGasFee property in state', function () {
+      const state = preferencesController.store.getState();
+      assert.equal(state.advancedGasFee, null);
+      preferencesController.setAdvancedGasFee({
+        maxBaseFee: '1.5',
+        priorityFee: '2',
+      });
+      assert.equal(
+        preferencesController.store.getState().advancedGasFee.maxBaseFee,
+        '1.5',
+      );
+      assert.equal(
+        preferencesController.store.getState().advancedGasFee.priorityFee,
+        '2',
+      );
+    });
+  });
 });
diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
index 0d69dd77c..57cd11b9c 100644
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@@ -280,7 +280,7 @@ export default class SwapsController {
 
       // For a user to be able to swap a token, they need to have approved the MetaSwap contract to withdraw that token.
       // _getERC20Allowance() returns the amount of the token they have approved for withdrawal. If that amount is greater
-      // than 0, it means that approval has already occured and is not needed. Otherwise, for tokens to be swapped, a new
+      // than 0, it means that approval has already occurred and is not needed. Otherwise, for tokens to be swapped, a new
       // call of the ERC-20 approve method is required.
       approvalRequired =
         allowance.eq(0) &&
diff --git a/app/scripts/controllers/threebox.js b/app/scripts/controllers/threebox.js
index 10b231b38..fc278d0b2 100644
--- a/app/scripts/controllers/threebox.js
+++ b/app/scripts/controllers/threebox.js
@@ -8,7 +8,7 @@ const Box = process.env.IN_TEST
 
 import log from 'loglevel';
 import { JsonRpcEngine } from 'json-rpc-engine';
-import providerFromEngine from 'eth-json-rpc-middleware/providerFromEngine';
+import { providerFromEngine } from 'eth-json-rpc-middleware';
 import Migrator from '../lib/migrator';
 import migrations from '../migrations';
 import createOriginMiddleware from '../lib/createOriginMiddleware';
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 4c95556ee..0f1d15961 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -26,10 +26,13 @@ import {
   TRANSACTION_TYPES,
   TRANSACTION_ENVELOPE_TYPES,
 } from '../../../../shared/constants/transaction';
+import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../../ui/helpers/constants/transactions';
 import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';
 import {
   GAS_LIMITS,
   GAS_ESTIMATE_TYPES,
+  GAS_RECOMMENDATIONS,
+  CUSTOM_GAS_ESTIMATE,
 } from '../../../../shared/constants/gas';
 import { decGWEIToHexWEI } from '../../../../shared/modules/conversion.utils';
 import {
@@ -435,7 +438,7 @@ export default class TransactionController extends EventEmitter {
       ) {
         txMeta.txParams.maxFeePerGas = txMeta.txParams.gasPrice;
         txMeta.txParams.maxPriorityFeePerGas = txMeta.txParams.gasPrice;
-        txMeta.userFeeLevel = 'custom';
+        txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
       } else {
         if (
           (defaultMaxFeePerGas &&
@@ -444,9 +447,9 @@ export default class TransactionController extends EventEmitter {
             !txMeta.txParams.maxPriorityFeePerGas) ||
           txMeta.origin === 'metamask'
         ) {
-          txMeta.userFeeLevel = 'medium';
+          txMeta.userFeeLevel = GAS_RECOMMENDATIONS.MEDIUM;
         } else {
-          txMeta.userFeeLevel = 'custom';
+          txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
         }
 
         if (defaultMaxFeePerGas && !txMeta.txParams.maxFeePerGas) {
@@ -1445,8 +1448,8 @@ export default class TransactionController extends EventEmitter {
       sensitiveProperties: {
         status,
         transaction_envelope_type: isEIP1559Transaction(txMeta)
-          ? 'fee-market'
-          : 'legacy',
+          ? TRANSACTION_ENVELOPE_TYPE_NAMES.FEE_MARKET
+          : TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
         first_seen: time,
         gas_limit: gasLimit,
         ...gasParamsInGwei,
diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js
index 3416d47ae..c2f7a344b 100644
--- a/app/scripts/controllers/transactions/index.test.js
+++ b/app/scripts/controllers/transactions/index.test.js
@@ -12,9 +12,15 @@ import {
 import {
   TRANSACTION_STATUSES,
   TRANSACTION_TYPES,
+  TRANSACTION_ENVELOPE_TYPES,
 } from '../../../../shared/constants/transaction';
+
 import { SECOND } from '../../../../shared/constants/time';
-import { GAS_ESTIMATE_TYPES } from '../../../../shared/constants/gas';
+import {
+  GAS_ESTIMATE_TYPES,
+  GAS_RECOMMENDATIONS,
+} from '../../../../shared/constants/gas';
+import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../../ui/helpers/constants/transactions';
 import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';
 import TransactionController, { TRANSACTION_EVENTS } from '.';
 
@@ -544,7 +550,7 @@ describe('Transaction Controller', function () {
           txParams: {
             to: VALID_ADDRESS,
             from: VALID_ADDRESS_TWO,
-            type: '0x0',
+            type: TRANSACTION_ENVELOPE_TYPES.LEGACY,
           },
           history: [{}],
         },
@@ -554,7 +560,7 @@ describe('Transaction Controller', function () {
         txParams: {
           from: '0xc684832530fcbddae4b4230a47e991ddcec2831d',
           to: '0xc684832530fcbddae4b4230a47e991ddcec2831d',
-          type: '0x0',
+          type: TRANSACTION_ENVELOPE_TYPES.LEGACY,
         },
         history: [{}],
       };
@@ -769,7 +775,7 @@ describe('Transaction Controller', function () {
           nonce: '0x4b',
         },
         type: TRANSACTION_TYPES.SIMPLE_SEND,
-        transaction_envelope_type: 'legacy',
+        transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
         origin: 'metamask',
         chainId: currentChainId,
         time: 1624408066355,
@@ -999,8 +1005,8 @@ describe('Transaction Controller', function () {
         to: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',
         gas: '0x5209',
         gasPrice: '0xa',
-        estimateSuggested: 'medium',
-        estimateUsed: 'high',
+        estimateSuggested: GAS_RECOMMENDATIONS.MEDIUM,
+        estimateUsed: GAS_RECOMMENDATIONS.HIGH,
       };
       txController.txStateManager._addTransactionsToState([
         {
@@ -1573,7 +1579,7 @@ describe('Transaction Controller', function () {
           gas_price: '2',
           gas_limit: '0x7b0d',
           first_seen: 1624408066355,
-          transaction_envelope_type: 'legacy',
+          transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
           status: 'unapproved',
         },
       };
@@ -1620,7 +1626,7 @@ describe('Transaction Controller', function () {
           gas_price: '2',
           gas_limit: '0x7b0d',
           first_seen: 1624408066355,
-          transaction_envelope_type: 'legacy',
+          transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
           status: 'unapproved',
         },
       };
@@ -1669,7 +1675,7 @@ describe('Transaction Controller', function () {
           gas_price: '2',
           gas_limit: '0x7b0d',
           first_seen: 1624408066355,
-          transaction_envelope_type: 'legacy',
+          transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
           status: 'unapproved',
         },
       };
@@ -1700,8 +1706,8 @@ describe('Transaction Controller', function () {
           maxPriorityFeePerGas: '0x77359400',
           gas: '0x7b0d',
           nonce: '0x4b',
-          estimateSuggested: 'medium',
-          estimateUsed: 'high',
+          estimateSuggested: GAS_RECOMMENDATIONS.MEDIUM,
+          estimateUsed: GAS_RECOMMENDATIONS.HIGH,
         },
         type: TRANSACTION_TYPES.SIMPLE_SEND,
         origin: 'other',
@@ -1726,10 +1732,10 @@ describe('Transaction Controller', function () {
           max_priority_fee_per_gas: '2',
           gas_limit: '0x7b0d',
           first_seen: 1624408066355,
-          transaction_envelope_type: 'fee-market',
+          transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.FEE_MARKET,
           status: 'unapproved',
-          estimate_suggested: 'medium',
-          estimate_used: 'high',
+          estimate_suggested: GAS_RECOMMENDATIONS.MEDIUM,
+          estimate_used: GAS_RECOMMENDATIONS.HIGH,
         },
       };
 
@@ -1802,14 +1808,14 @@ describe('Transaction Controller', function () {
       const params = {
         max_fee_per_gas: '0x77359400',
         max_priority_fee_per_gas: '0x77359400',
-        estimate_suggested: 'medium',
-        estimate_used: 'high',
+        estimate_suggested: GAS_RECOMMENDATIONS.MEDIUM,
+        estimate_used: GAS_RECOMMENDATIONS.HIGH,
       };
       const expectedParams = {
         max_fee_per_gas: '2',
         max_priority_fee_per_gas: '2',
-        estimate_suggested: 'medium',
-        estimate_used: 'high',
+        estimate_suggested: GAS_RECOMMENDATIONS.MEDIUM,
+        estimate_used: GAS_RECOMMENDATIONS.HIGH,
       };
       const result = txController._getGasValuesInGWEI(params);
       assert.deepEqual(result, expectedParams);
diff --git a/app/scripts/controllers/transactions/lib/util.test.js b/app/scripts/controllers/transactions/lib/util.test.js
index b5b94d5fc..6c162ef4e 100644
--- a/app/scripts/controllers/transactions/lib/util.test.js
+++ b/app/scripts/controllers/transactions/lib/util.test.js
@@ -1,6 +1,7 @@
 import { strict as assert } from 'assert';
 import { TRANSACTION_ENVELOPE_TYPES } from '../../../../../shared/constants/transaction';
 import { BURN_ADDRESS } from '../../../../../shared/modules/hexstring-utils';
+import { GAS_RECOMMENDATIONS } from '../../../../../shared/constants/gas';
 import * as txUtils from './util';
 
 describe('txUtils', function () {
@@ -323,8 +324,8 @@ describe('txUtils', function () {
         gasPrice: '1',
         maxFeePerGas: '1',
         maxPriorityFeePerGas: '1',
-        estimateSuggested: 'medium',
-        estimateUsed: 'high',
+        estimateSuggested: GAS_RECOMMENDATIONS.MEDIUM,
+        estimateUsed: GAS_RECOMMENDATIONS.HIGH,
         type: '1',
       };
 
@@ -382,12 +383,12 @@ describe('txUtils', function () {
 
       assert.equal(
         normalizedTxParams.estimateSuggested,
-        'medium',
+        GAS_RECOMMENDATIONS.MEDIUM,
         'estimateSuggested should be the string originally provided',
       );
       assert.equal(
         normalizedTxParams.estimateUsed,
-        'high',
+        GAS_RECOMMENDATIONS.HIGH,
         'estimateSuggested should be the string originally provided',
       );
     });
diff --git a/app/scripts/first-time-state.js b/app/scripts/first-time-state.js
index 857921889..34969b58f 100644
--- a/app/scripts/first-time-state.js
+++ b/app/scripts/first-time-state.js
@@ -10,15 +10,7 @@
 const initialState = {
   config: {},
   PreferencesController: {
-    frequentRpcListDetail: [
-      {
-        rpcUrl: 'http://localhost:8545',
-        chainId: '0x539',
-        ticker: 'ETH',
-        nickname: 'Localhost 8545',
-        rpcPrefs: {},
-      },
-    ],
+    frequentRpcListDetail: [],
   },
 };
 
diff --git a/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js
index ea2370217..fa7798d0d 100644
--- a/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js
+++ b/app/scripts/lib/rpc-method-middleware/createMethodMiddleware.js
@@ -1,3 +1,5 @@
+import { ethErrors } from 'eth-rpc-errors';
+import { UNSUPPORTED_RPC_METHODS } from '../../../../shared/constants/network';
 import handlers from './handlers';
 
 const handlerMap = handlers.reduce((map, handler) => {
@@ -26,6 +28,11 @@ const handlerMap = handlers.reduce((map, handler) => {
  */
 export default function createMethodMiddleware(opts) {
   return function methodMiddleware(req, res, next, end) {
+    // Reject unsupported methods.
+    if (UNSUPPORTED_RPC_METHODS.has(req.method)) {
+      return end(ethErrors.rpc.methodNotSupported());
+    }
+
     if (handlerMap.has(req.method)) {
       return handlerMap.get(req.method)(req, res, next, end, opts);
     }
diff --git a/app/scripts/lib/util.js b/app/scripts/lib/util.js
index 9467218ca..c5c35a7d5 100644
--- a/app/scripts/lib/util.js
+++ b/app/scripts/lib/util.js
@@ -56,21 +56,20 @@ const getEnvironmentType = (url = window.location.href) =>
  * @returns {string} the platform ENUM
  *
  */
-const getPlatform = (_) => {
-  const ua = window.navigator.userAgent;
-  if (ua.search('Firefox') === -1) {
-    if (window && window.chrome && window.chrome.ipcRenderer) {
-      return PLATFORM_BRAVE;
-    }
-    if (ua.search('Edge') !== -1) {
-      return PLATFORM_EDGE;
-    }
-    if (ua.search('OPR') !== -1) {
-      return PLATFORM_OPERA;
-    }
-    return PLATFORM_CHROME;
+const getPlatform = () => {
+  const { navigator } = window;
+  const { userAgent } = navigator;
+
+  if (userAgent.includes('Firefox')) {
+    return PLATFORM_FIREFOX;
+  } else if ('brave' in navigator) {
+    return PLATFORM_BRAVE;
+  } else if (userAgent.includes('Edg/')) {
+    return PLATFORM_EDGE;
+  } else if (userAgent.includes('OPR')) {
+    return PLATFORM_OPERA;
   }
-  return PLATFORM_FIREFOX;
+  return PLATFORM_CHROME;
 };
 
 /**
diff --git a/app/scripts/lib/util.test.js b/app/scripts/lib/util.test.js
index f21c10d5e..d25949bc4 100644
--- a/app/scripts/lib/util.test.js
+++ b/app/scripts/lib/util.test.js
@@ -1,13 +1,17 @@
 import { strict as assert } from 'assert';
+import sinon from 'sinon';
 import { isPrefixedFormattedHexString } from '../../../shared/modules/network.utils';
-
 import {
   ENVIRONMENT_TYPE_POPUP,
   ENVIRONMENT_TYPE_NOTIFICATION,
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_BACKGROUND,
+  PLATFORM_FIREFOX,
+  PLATFORM_OPERA,
+  PLATFORM_CHROME,
+  PLATFORM_EDGE,
 } from '../../../shared/constants/app';
-import { getEnvironmentType } from './util';
+import { getEnvironmentType, getPlatform } from './util';
 
 describe('app utils', function () {
   describe('getEnvironmentType', function () {
@@ -151,4 +155,59 @@ describe('app utils', function () {
       );
     });
   });
+
+  describe('getPlatform', function () {
+    const setBrowserSpecificWindow = (browser) => {
+      switch (browser) {
+        case 'firefox': {
+          sinon.stub(window, 'navigator').value({
+            userAgent:
+              'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:95.0) Gecko/20100101 Firefox/95.0',
+          });
+          break;
+        }
+        case 'edge': {
+          sinon.stub(window, 'navigator').value({
+            userAgent:
+              'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.54 Safari/537.36 Edg/95.0.1020.30',
+          });
+          break;
+        }
+        case 'opera': {
+          sinon.stub(window, 'navigator').value({
+            userAgent:
+              'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36 OPR/80.0.4170.63',
+          });
+          break;
+        }
+        default: {
+          sinon.stub(window, 'navigator').value({
+            userAgent:
+              'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.81 Safari/537.36',
+          });
+          break;
+        }
+      }
+    };
+
+    it('should detect Firefox', function () {
+      setBrowserSpecificWindow('firefox');
+      assert.equal(getPlatform(), PLATFORM_FIREFOX);
+    });
+
+    it('should detect Edge', function () {
+      setBrowserSpecificWindow('edge');
+      assert.equal(getPlatform(), PLATFORM_EDGE);
+    });
+
+    it('should detect Opera', function () {
+      setBrowserSpecificWindow('opera');
+      assert.equal(getPlatform(), PLATFORM_OPERA);
+    });
+
+    it('should detect Chrome', function () {
+      setBrowserSpecificWindow('chrome');
+      assert.equal(getPlatform(), PLATFORM_CHROME);
+    });
+  });
 });
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 106317bdd..531cdfb7a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -7,15 +7,17 @@ import { debounce } from 'lodash';
 import createEngineStream from 'json-rpc-middleware-stream/engineStream';
 import createFilterMiddleware from 'eth-json-rpc-filters';
 import createSubscriptionManager from 'eth-json-rpc-filters/subscriptionManager';
-import providerAsMiddleware from 'eth-json-rpc-middleware/providerAsMiddleware';
+import { providerAsMiddleware } from 'eth-json-rpc-middleware';
 import KeyringController from 'eth-keyring-controller';
 import { Mutex } from 'await-semaphore';
 import { stripHexPrefix } from 'ethereumjs-util';
 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 EthQuery from 'eth-query';
 import nanoid from 'nanoid';
+import { captureException } from '@sentry/browser';
 import {
   AddressBookController,
   ApprovalController,
@@ -189,6 +191,7 @@ export default class MetamaskController extends EventEmitter {
       version: this.platform.getVersion(),
       environment: process.env.METAMASK_ENVIRONMENT,
       initState: initState.MetaMetricsController,
+      captureException,
     });
 
     const gasFeeMessenger = this.controllerMessenger.getRestricted({
@@ -370,7 +373,11 @@ export default class MetamaskController extends EventEmitter {
       await opts.openPopup();
     });
 
-    const additionalKeyrings = [TrezorKeyring, LedgerBridgeKeyring];
+    const additionalKeyrings = [
+      TrezorKeyring,
+      LedgerBridgeKeyring,
+      LatticeKeyring,
+    ];
     this.keyringController = new KeyringController({
       keyringTypes: additionalKeyrings,
       initState: initState.KeyringController,
@@ -917,6 +924,10 @@ export default class MetamaskController extends EventEmitter {
         this.preferencesController.setDismissSeedBackUpReminder,
         this.preferencesController,
       ),
+      setAdvancedGasFee: nodeify(
+        preferencesController.setAdvancedGasFee,
+        preferencesController,
+      ),
 
       // AddressController
       setAddressBook: nodeify(
@@ -1445,6 +1456,7 @@ export default class MetamaskController extends EventEmitter {
         .map((address) => toChecksumHexAddress(address)),
       ledger: [],
       trezor: [],
+      lattice: [],
     };
 
     // transactions
@@ -1545,6 +1557,9 @@ export default class MetamaskController extends EventEmitter {
       case 'ledger':
         keyringName = LedgerBridgeKeyring.type;
         break;
+      case 'lattice':
+        keyringName = LatticeKeyring.type;
+        break;
       default:
         throw new Error(
           'MetamaskController:getKeyringForDevice - Unknown device',
@@ -1559,7 +1574,9 @@ export default class MetamaskController extends EventEmitter {
     if (hdPath && keyring.setHdPath) {
       keyring.setHdPath(hdPath);
     }
-
+    if (deviceName === 'lattice') {
+      keyring.appName = 'MetaMask';
+    }
     keyring.network = this.networkController.getProviderConfig().type;
 
     return keyring;
@@ -2047,6 +2064,14 @@ export default class MetamaskController extends EventEmitter {
         });
       }
 
+      case KEYRING_TYPES.LATTICE: {
+        return new Promise((_, reject) => {
+          reject(
+            new Error('Lattice does not support eth_getEncryptionPublicKey.'),
+          );
+        });
+      }
+
       default: {
         const promise = this.encryptionPublicKeyManager.addUnapprovedMessageAsync(
           msgParams,
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index eeaea008d..4f7705a95 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -262,9 +262,9 @@ export default class ExtensionPlatform {
     }
   }
 
-  _viewOnEtherscan(txId) {
-    if (txId.startsWith('https://')) {
-      extension.tabs.create({ url: txId });
+  _viewOnEtherscan(url) {
+    if (url.startsWith('https://')) {
+      extension.tabs.create({ url });
     }
   }
 }
diff --git a/development/build/index.js b/development/build/index.js
index fd0ffffb3..7ee92f672 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -3,8 +3,10 @@
 //
 // run any task with "yarn build ${taskName}"
 //
+const path = require('path');
 const livereload = require('gulp-livereload');
 const minimist = require('minimist');
+const { sync: globby } = require('globby');
 const {
   createTask,
   composeSeries,
@@ -18,7 +20,8 @@ const createStaticAssetTasks = require('./static');
 const createEtcTasks = require('./etc');
 const { BuildType, getBrowserVersionMap } = require('./utils');
 
-// packages required dynamically via browserify configuration in dependencies
+// Packages required dynamically via browserify configuration in dependencies
+// Required for LavaMoat policy generation
 require('loose-envify');
 require('@babel/plugin-proposal-object-rest-spread');
 require('@babel/plugin-transform-runtime');
@@ -28,6 +31,19 @@ require('@babel/plugin-proposal-nullish-coalescing-operator');
 require('@babel/preset-env');
 require('@babel/preset-react');
 require('@babel/core');
+// ESLint-related
+require('@babel/eslint-parser');
+require('@babel/eslint-plugin');
+require('@metamask/eslint-config');
+require('@metamask/eslint-config-nodejs');
+require('eslint');
+require('eslint-config-prettier');
+require('eslint-import-resolver-node');
+require('eslint-plugin-import');
+require('eslint-plugin-node');
+require('eslint-plugin-prettier');
+require('eslint-plugin-react');
+require('eslint-plugin-react-hooks');
 
 defineAndRunBuildTasks();
 
@@ -45,6 +61,8 @@ function defineAndRunBuildTasks() {
 
   const browserVersionMap = getBrowserVersionMap(browserPlatforms);
 
+  const ignoredFiles = getIgnoredFiles(buildType);
+
   const staticTasks = createStaticAssetTasks({
     livereload,
     browserPlatforms,
@@ -63,6 +81,7 @@ function defineAndRunBuildTasks() {
   const scriptTasks = createScriptTasks({
     browserPlatforms,
     buildType,
+    ignoredFiles,
     isLavaMoat,
     livereload,
     shouldLintFenceFiles,
@@ -188,3 +207,35 @@ function parseArgv() {
     skipStats: argv[NamedArgs.SkipStats],
   };
 }
+
+/**
+ * Gets the files to be ignored by the current build, if any.
+ *
+ * @param {string} buildType - The type of the current build.
+ * @returns {string[] | null} The array of files to be ignored by the current
+ * build, or `null` if no files are to be ignored.
+ */
+function getIgnoredFiles(currentBuildType) {
+  const excludedFiles = Object.values(BuildType)
+    // This filter removes "main" and the current build type. The files of any
+    // build types that remain in the array will be excluded. "main" is the
+    // default build type, and has no files that are excluded from other builds.
+    .filter(
+      (buildType) =>
+        buildType !== BuildType.main && buildType !== currentBuildType,
+    )
+    // Compute globs targeting files for exclusion for each excluded build
+    // type.
+    .reduce((excludedGlobs, excludedBuildType) => {
+      return excludedGlobs.concat([
+        `../../app/**/${excludedBuildType}/**`,
+        `../../shared/**/${excludedBuildType}/**`,
+        `../../ui/**/${excludedBuildType}/**`,
+      ]);
+    }, [])
+    // This creates absolute paths of the form:
+    // PATH_TO_REPOSITORY_ROOT/app/**/${excludedBuildType}/**
+    .map((pathGlob) => path.resolve(__dirname, pathGlob));
+
+  return globby(excludedFiles);
+}
diff --git a/development/build/manifest.js b/development/build/manifest.js
index ebca66f16..a87fd53de 100644
--- a/development/build/manifest.js
+++ b/development/build/manifest.js
@@ -3,7 +3,6 @@ const path = require('path');
 const { merge, cloneDeep } = require('lodash');
 
 const baseManifest = require('../../app/manifest/_base.json');
-const betaManifestModifications = require('../../app/manifest/_beta_modifications.json');
 
 const { createTask, composeSeries } = require('./task');
 const { BuildType } = require('./utils');
@@ -33,7 +32,7 @@ function createManifestTasks({
           cloneDeep(baseManifest),
           platformModifications,
           browserVersionMap[platform],
-          getBuildModifications(buildType),
+          await getBuildModifications(buildType, platform),
         );
         const dir = path.join('.', 'dist', platform);
         await fs.mkdir(dir, { recursive: true });
@@ -112,10 +111,53 @@ async function writeJson(obj, file) {
   return fs.writeFile(file, JSON.stringify(obj, null, 2));
 }
 
-function getBuildModifications(buildType) {
-  const buildModifications = {};
-  if (buildType === BuildType.beta) {
-    Object.assign(buildModifications, betaManifestModifications);
+/**
+ * Get manifest modifications for the given build type, including modifications specific to the
+ * given platform.
+ *
+ * @param {BuildType} buildType - The build type.
+ * @param {string} platform - The platform (i.e. the browser).
+ * @returns {Object} The build modificantions for the given build type and platform.
+ */
+async function getBuildModifications(buildType, platform) {
+  if (!Object.values(BuildType).includes(buildType)) {
+    throw new Error(`Invalid build type: ${buildType}`);
+  } else if (buildType === BuildType.main) {
+    return {};
   }
+
+  const builtTypeManifestDirectoryPath = path.resolve(
+    __dirname,
+    '..',
+    '..',
+    'app',
+    'build-types',
+    buildType,
+    'manifest',
+  );
+
+  const baseBuildTypeModificationsPath = path.join(
+    builtTypeManifestDirectoryPath,
+    '_base.json',
+  );
+  const buildModifications = await readJson(baseBuildTypeModificationsPath);
+
+  const platformBuildTypeModificationsPath = path.join(
+    builtTypeManifestDirectoryPath,
+    `${platform}.json`,
+  );
+  try {
+    const platformBuildTypeModifications = await readJson(
+      platformBuildTypeModificationsPath,
+    );
+    Object.assign(buildModifications, platformBuildTypeModifications);
+  } catch (error) {
+    // Suppress 'ENOENT' error because it indicates there are no platform-specific manifest
+    // modifications for this build type.
+    if (error.code !== 'ENOENT') {
+      throw error;
+    }
+  }
+
   return buildModifications;
 }
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 295590f1a..8aefbad6b 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -29,10 +29,17 @@ const bifyModuleGroups = require('bify-module-groups');
 
 const metamaskrc = require('rc')('metamask', {
   INFURA_PROJECT_ID: process.env.INFURA_PROJECT_ID,
+  INFURA_BETA_PROJECT_ID: process.env.INFURA_BETA_PROJECT_ID,
+  INFURA_FLASK_PROJECT_ID: process.env.INFURA_FLASK_PROJECT_ID,
   INFURA_PROD_PROJECT_ID: process.env.INFURA_PROD_PROJECT_ID,
   ONBOARDING_V2: process.env.ONBOARDING_V2,
+  COLLECTIBLES_V1: process.env.COLLECTIBLES_V1,
+  EIP_1559_V2: process.env.EIP_1559_V2,
   SEGMENT_HOST: process.env.SEGMENT_HOST,
   SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY,
+  SEGMENT_BETA_WRITE_KEY: process.env.SEGMENT_BETA_WRITE_KEY,
+  SEGMENT_FLASK_WRITE_KEY: process.env.SEGMENT_FLASK_WRITE_KEY,
+  SEGMENT_PROD_WRITE_KEY: process.env.SEGMENT_PROD_WRITE_KEY,
   SENTRY_DSN_DEV:
     process.env.SENTRY_DSN_DEV ||
     'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496',
@@ -50,6 +57,7 @@ const {
 const {
   createRemoveFencedCodeTransform,
 } = require('./transforms/remove-fenced-code');
+const { BuildType } = require('./utils');
 
 /**
  * The build environment. This describes the environment this build was produced in.
@@ -83,17 +91,47 @@ function getConfigValue(key) {
  * Get the appropriate Infura project ID.
  *
  * @param {object} options - The Infura project ID options.
+ * @param {BuildType} options.buildType - The current build type.
  * @param {ENVIRONMENT[keyof ENVIRONMENT]} options.environment - The build environment.
  * @param {boolean} options.testing - Whether the current build is a test build or not.
  * @returns {string} The Infura project ID.
  */
-function getInfuraProjectId({ environment, testing }) {
+function getInfuraProjectId({ buildType, environment, testing }) {
   if (testing) {
     return '00000000000000000000000000000000';
-  } else if (environment === ENVIRONMENT.PRODUCTION) {
+  } else if (environment !== ENVIRONMENT.PRODUCTION) {
+    // Skip validation because this is unset on PRs from forks.
+    return metamaskrc.INFURA_PROJECT_ID;
+  } else if (buildType === BuildType.main) {
     return getConfigValue('INFURA_PROD_PROJECT_ID');
+  } else if (buildType === BuildType.beta) {
+    return getConfigValue('INFURA_BETA_PROJECT_ID');
+  } else if (buildType === BuildType.flask) {
+    return getConfigValue('INFURA_FLASK_PROJECT_ID');
   }
-  return getConfigValue('INFURA_PROJECT_ID');
+  throw new Error(`Invalid build type: '${buildType}'`);
+}
+
+/**
+ * Get the appropriate Segment write key.
+ *
+ * @param {object} options - The Segment write key options.
+ * @param {BuildType} options.buildType - The current build type.
+ * @param {keyof ENVIRONMENT} options.enviroment - The current build environment.
+ * @returns {string} The Segment write key.
+ */
+function getSegmentWriteKey({ buildType, environment }) {
+  if (environment !== ENVIRONMENT.PRODUCTION) {
+    // Skip validation because this is unset on PRs from forks, and isn't necessary for development builds.
+    return metamaskrc.SEGMENT_WRITE_KEY;
+  } else if (buildType === BuildType.main) {
+    return getConfigValue('SEGMENT_PROD_WRITE_KEY');
+  } else if (buildType === BuildType.beta) {
+    return getConfigValue('SEGMENT_BETA_WRITE_KEY');
+  } else if (buildType === BuildType.flask) {
+    return getConfigValue('SEGMENT_FLASK_WRITE_KEY');
+  }
+  throw new Error(`Invalid build type: '${buildType}'`);
 }
 
 module.exports = createScriptTasks;
@@ -101,6 +139,7 @@ module.exports = createScriptTasks;
 function createScriptTasks({
   browserPlatforms,
   buildType,
+  ignoredFiles,
   isLavaMoat,
   livereload,
   shouldLintFenceFiles,
@@ -145,8 +184,9 @@ function createScriptTasks({
           }
           return `./app/scripts/${label}.js`;
         }),
-        testing,
+        ignoredFiles,
         shouldLintFenceFiles,
+        testing,
       }),
     );
 
@@ -216,6 +256,7 @@ function createScriptTasks({
       destFilepath: `${label}.js`,
       devMode,
       entryFilepath: `./app/scripts/${label}.js`,
+      ignoredFiles,
       label,
       shouldLintFenceFiles,
     });
@@ -229,6 +270,7 @@ function createScriptTasks({
       destFilepath: `${label}.js`,
       devMode,
       entryFilepath: `./app/scripts/${label}.js`,
+      ignoredFiles,
       label,
       shouldLintFenceFiles,
     });
@@ -242,6 +284,7 @@ function createScriptTasks({
       destFilepath: `${label}.js`,
       devMode,
       entryFilepath: `./app/scripts/${label}.js`,
+      ignoredFiles,
       label,
       shouldLintFenceFiles,
     });
@@ -259,8 +302,9 @@ function createScriptTasks({
         devMode,
         entryFilepath: `./app/scripts/${inpage}.js`,
         label: inpage,
-        testing,
+        ignoredFiles,
         shouldLintFenceFiles,
+        testing,
       }),
       createNormalBundle({
         buildType,
@@ -269,8 +313,9 @@ function createScriptTasks({
         devMode,
         entryFilepath: `./app/scripts/${contentscript}.js`,
         label: contentscript,
-        testing,
+        ignoredFiles,
         shouldLintFenceFiles,
+        testing,
       }),
     );
   }
@@ -281,8 +326,9 @@ function createFactoredBuild({
   buildType,
   devMode,
   entryFiles,
-  testing,
+  ignoredFiles,
   shouldLintFenceFiles,
+  testing,
 }) {
   return async function () {
     // create bundler setup and apply defaults
@@ -299,6 +345,7 @@ function createFactoredBuild({
       buildType,
       devMode,
       envVars,
+      ignoredFiles,
       minify,
       reloadOnChange,
       shouldLintFenceFiles,
@@ -409,7 +456,7 @@ function createFactoredBuild({
               groupSet,
               commonSet,
               browserPlatforms,
-              useLavamoat: false,
+              useLavamoat: true,
             });
             break;
           }
@@ -443,6 +490,7 @@ function createNormalBundle({
   devMode,
   entryFilepath,
   extraEntries = [],
+  ignoredFiles,
   label,
   modulesToExpose,
   shouldLintFenceFiles,
@@ -463,6 +511,7 @@ function createNormalBundle({
       buildType,
       devMode,
       envVars,
+      ignoredFiles,
       minify,
       reloadOnChange,
       shouldLintFenceFiles,
@@ -507,12 +556,20 @@ function createBuildConfiguration() {
     manualExternal: [],
     manualIgnore: [],
   };
-  return { label, bundlerOpts, events };
+  return { bundlerOpts, events, label };
 }
 
 function setupBundlerDefaults(
   buildConfiguration,
-  { buildType, devMode, envVars, minify, reloadOnChange, shouldLintFenceFiles },
+  {
+    buildType,
+    devMode,
+    envVars,
+    ignoredFiles,
+    minify,
+    reloadOnChange,
+    shouldLintFenceFiles,
+  },
 ) {
   const { bundlerOpts } = buildConfiguration;
 
@@ -542,6 +599,11 @@ function setupBundlerDefaults(
     bundlerOpts.transform.push([envify(envVars), { global: true }]);
   }
 
+  // Ensure that any files that should be ignored are excluded from the build
+  if (ignoredFiles) {
+    bundlerOpts.manualExclude = ignoredFiles;
+  }
+
   // Setup reload on change
   if (reloadOnChange) {
     setupReloadOnChange(buildConfiguration);
@@ -624,11 +686,17 @@ function setupSourcemaps(buildConfiguration, { devMode }) {
 async function bundleIt(buildConfiguration) {
   const { label, bundlerOpts, events } = buildConfiguration;
   const bundler = browserify(bundlerOpts);
+
   // manually apply non-standard options
   bundler.external(bundlerOpts.manualExternal);
   bundler.ignore(bundlerOpts.manualIgnore);
+  if (Array.isArray(bundlerOpts.manualExclude)) {
+    bundler.exclude(bundlerOpts.manualExclude);
+  }
+
   // output build logs to terminal
   bundler.on('log', log);
+
   // forward update event (used by watchify)
   bundler.on('update', () => performBundle());
 
@@ -685,19 +753,13 @@ function getEnvironmentVariables({ buildType, devMode, testing }) {
     CONF: devMode ? metamaskrc : {},
     SENTRY_DSN: process.env.SENTRY_DSN,
     SENTRY_DSN_DEV: metamaskrc.SENTRY_DSN_DEV,
-    INFURA_PROJECT_ID: getInfuraProjectId({ environment, testing }),
+    INFURA_PROJECT_ID: getInfuraProjectId({ buildType, environment, testing }),
     SEGMENT_HOST: metamaskrc.SEGMENT_HOST,
-    // When we're in the 'production' environment we will use a specific key only set in CI
-    // Otherwise we'll use the key from .metamaskrc or from the environment variable. If
-    // the value of SEGMENT_WRITE_KEY that we envify is undefined then no events will be tracked
-    // in the build. This is intentional so that developers can contribute to MetaMask without
-    // inflating event volume.
-    SEGMENT_WRITE_KEY:
-      environment === ENVIRONMENT.PRODUCTION
-        ? process.env.SEGMENT_PROD_WRITE_KEY
-        : metamaskrc.SEGMENT_WRITE_KEY,
+    SEGMENT_WRITE_KEY: getSegmentWriteKey({ buildType, environment }),
     SWAPS_USE_DEV_APIS: process.env.SWAPS_USE_DEV_APIS === '1',
     ONBOARDING_V2: metamaskrc.ONBOARDING_V2 === '1',
+    COLLECTIBLES_V1: metamaskrc.COLLECTIBLES_V1 === '1',
+    EIP_1559_V2: metamaskrc.EIP_1559_V2 === '1',
   };
 }
 
diff --git a/development/build/static.js b/development/build/static.js
index 8c1961973..1ec935502 100644
--- a/development/build/static.js
+++ b/development/build/static.js
@@ -23,7 +23,13 @@ module.exports = function createStaticAssetTasks({
   const additionalBuildTargets = {
     [BuildType.beta]: [
       {
-        src: './app/build-types/beta/',
+        src: './app/build-types/beta/images/',
+        dest: `images`,
+      },
+    ],
+    [BuildType.flask]: [
+      {
+        src: './app/build-types/flask/images/',
         dest: `images`,
       },
     ],
diff --git a/development/build/transforms/remove-fenced-code.js b/development/build/transforms/remove-fenced-code.js
index 7f26ad6cf..200233fe8 100644
--- a/development/build/transforms/remove-fenced-code.js
+++ b/development/build/transforms/remove-fenced-code.js
@@ -408,7 +408,9 @@ function multiSplice(toSplice, splicingIndices) {
   // pushes the substring between each "end" index and the next "begin" index
   // to the array of retained substrings.
   if (splicingIndices.length > 2) {
-    for (let i = 1; i < splicingIndices.length; i += 2) {
+    // Note the boundary index of "splicingIndices.length - 1". This loop must
+    // not iterate over the last element of the array.
+    for (let i = 1; i < splicingIndices.length - 1; i += 2) {
       retainedSubstrings.push(
         toSplice.substring(splicingIndices[i], splicingIndices[i + 1]),
       );
diff --git a/development/build/transforms/remove-fenced-code.test.js b/development/build/transforms/remove-fenced-code.test.js
index 33461b89d..5eebc1135 100644
--- a/development/build/transforms/remove-fenced-code.test.js
+++ b/development/build/transforms/remove-fenced-code.test.js
@@ -201,6 +201,14 @@ describe('build/transforms/remove-fenced-code', () => {
           ),
         ).toStrictEqual(testData.validOutputs[buildType]);
 
+        expect(
+          removeFencedCode(
+            mockFileName,
+            buildType,
+            testData.validInputs.extraContentWithFences,
+          ),
+        ).toStrictEqual(testData.validOutputsWithExtraContent[buildType]);
+
         // Ensure that the minimal input template is in fact valid
         const minimalInput = getMinimalFencedCode(buildType);
         expect(
@@ -216,6 +224,17 @@ describe('build/transforms/remove-fenced-code', () => {
             testData.validInputs.withoutFences,
           ),
         ).toStrictEqual([testData.validInputs.withoutFences, false]);
+
+        expect(
+          removeFencedCode(
+            mockFileName,
+            buildType,
+            testData.validInputs.extraContentWithoutFences,
+          ),
+        ).toStrictEqual([
+          testData.validInputs.extraContentWithoutFences,
+          false,
+        ]);
       });
     });
 
@@ -611,6 +630,43 @@ Conditionally_Included
        ///: END:ONLY_INCLUDE_IN
 `,
 
+      extraContentWithFences: `
+///: BEGIN:ONLY_INCLUDE_IN(flask,beta)
+Conditionally_Included
+///: END:ONLY_INCLUDE_IN
+  Always_Included
+Always_Included
+   Always_Included
+Always_Included
+  ///: BEGIN:ONLY_INCLUDE_IN(flask,beta)
+  Conditionally_Included
+
+  Conditionally_Included
+  Conditionally_Included
+  ///: END:ONLY_INCLUDE_IN
+Always_Included
+
+Always_Included
+   Always_Included
+          ///: BEGIN:ONLY_INCLUDE_IN(flask)
+
+  Conditionally_Included
+    Conditionally_Included
+       ///: END:ONLY_INCLUDE_IN
+Always_Included
+   Always_Included
+Always_Included
+
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+  Conditionally_Included
+Conditionally_Included
+
+       ///: END:ONLY_INCLUDE_IN
+    Always_Included
+      Always_Included
+Always_Included
+`,
+
       withoutFences: `
   Always_Included
 Always_Included
@@ -624,6 +680,24 @@ Always_Included
    Always_Included
 Always_Included
 
+`,
+
+      extraContentWithoutFences: `
+  Always_Included
+Always_Included
+   Always_Included
+Always_Included
+Always_Included
+
+Always_Included
+   Always_Included
+Always_Included
+   Always_Included
+Always_Included
+
+    Always_Included
+      Always_Included
+Always_Included
 `,
     },
 
@@ -651,6 +725,38 @@ Always_Included
    Always_Included
 Always_Included
 
+`,
+        true,
+      ],
+    },
+
+    validOutputsWithExtraContent: {
+      beta: [
+        `
+///: BEGIN:ONLY_INCLUDE_IN(flask,beta)
+Conditionally_Included
+///: END:ONLY_INCLUDE_IN
+  Always_Included
+Always_Included
+   Always_Included
+Always_Included
+  ///: BEGIN:ONLY_INCLUDE_IN(flask,beta)
+  Conditionally_Included
+
+  Conditionally_Included
+  Conditionally_Included
+  ///: END:ONLY_INCLUDE_IN
+Always_Included
+
+Always_Included
+   Always_Included
+Always_Included
+   Always_Included
+Always_Included
+
+    Always_Included
+      Always_Included
+Always_Included
 `,
         true,
       ],
@@ -659,5 +765,14 @@ Always_Included
 
   data.validOutputs.flask = [data.validInputs.withFences, false];
   data.validOutputs.main = [data.validInputs.withoutFences, true];
+
+  data.validOutputsWithExtraContent.flask = [
+    data.validInputs.extraContentWithFences,
+    false,
+  ];
+  data.validOutputsWithExtraContent.main = [
+    data.validInputs.extraContentWithoutFences,
+    true,
+  ];
   return deepFreeze(data);
 }
diff --git a/development/build/transforms/utils.js b/development/build/transforms/utils.js
index c438d5351..171c38eae 100644
--- a/development/build/transforms/utils.js
+++ b/development/build/transforms/utils.js
@@ -1,6 +1,22 @@
 const { ESLint } = require('eslint');
 const eslintrc = require('../../../.eslintrc.js');
 
+// We don't want linting to fail for purely stylistic reasons.
+eslintrc.rules['prettier/prettier'] = 'off';
+
+// Remove all test-related overrides. We will never lint test files here.
+eslintrc.overrides = eslintrc.overrides.filter((override) => {
+  return !(
+    (override.extends &&
+      override.extends.find(
+        (configName) =>
+          configName.includes('jest') || configName.includes('mocha'),
+      )) ||
+    (override.plugins &&
+      override.plugins.find((pluginName) => pluginName.includes('jest')))
+  );
+});
+
 /**
  * The singleton ESLint instance.
  *
diff --git a/development/states/navigate-txs.json b/development/states/navigate-txs.json
new file mode 100644
index 000000000..18281fd35
--- /dev/null
+++ b/development/states/navigate-txs.json
@@ -0,0 +1,320 @@
+{
+  "appState": {
+    "shouldClose": false,
+    "menuOpen": false,
+    "modal": {
+      "open": false,
+      "modalState": {
+        "name": null,
+        "props": {}
+      },
+      "previousModalState": {
+        "name": null
+      }
+    },
+    "sidebar": {
+      "isOpen": false,
+      "transitionName": "",
+      "type": ""
+    },
+    "alertOpen": false,
+    "alertMessage": null,
+    "qrCodeData": null,
+    "networkDropdownOpen": false,
+    "currentView": {
+      "name": "confTx",
+      "context": 0
+    },
+    "accountDetail": {
+      "subview": "transactions"
+    },
+    "transForward": false,
+    "isLoading": false,
+    "warning": null,
+    "buyView": {},
+    "isMouseUser": true,
+    "gasIsLoading": false,
+    "networkNonce": "0x92",
+    "defaultHdPaths": {
+      "trezor": "m/44'/60'/0'/0",
+      "ledger": "m/44'/60'/0'/0/0",
+      "lattice": "m/44'/60'/0'/0"
+    }
+  },
+  "confirmTransaction": {
+    "txData": {
+      "estimatedGas": "0x38f53",
+      "gasLimitSpecified": true,
+      "gasPriceSpecified": false,
+      "history": [],
+      "id": 2389644572638774,
+      "loadingDefaults": false,
+      "metamaskNetworkId": "4",
+      "origin": "remix.ethereum.org",
+      "status": "unapproved",
+      "time": 1538844223352,
+      "txParams": {
+        "data": "0x608060405234801561001057600080fd5b506102a7806100206000396000f30060806040526004361061004b5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663d13319c48114610050578063dfb29935146100da575b600080fd5b34801561005c57600080fd5b50610065610135565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561009f578181015183820152602001610087565b50505050905090810190601f1680156100cc5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100e657600080fd5b506040805160206004803580820135601f81018490048402850184019095528484526101339436949293602493928401919081908401838280828437509497506101cc9650505050505050565b005b60008054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156101c15780601f10610196576101008083540402835291602001916101c1565b820191906000526020600020905b8154815290600101906020018083116101a457829003601f168201915b505050505090505b90565b80516101df9060009060208401906101e3565b5050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061022457805160ff1916838001178555610251565b82800160010185558215610251579182015b82811115610251578251825591602001919060010190610236565b5061025d929150610261565b5090565b6101c991905b8082111561025d57600081556001016102675600a165627a7a72305820cf4282c534b8f2faad947d592afa109b907e4e6b2f52335b361b69c24fedb9580029",
+        "from": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+        "gas": "0x38f53",
+        "gasPrice": "0x3b9aca00",
+        "value": "0x0"
+      },
+      "type": "standard"
+    },
+    "tokenData": {},
+    "methodData": {},
+    "tokenProps": {
+      "tokenDecimals": "",
+      "tokenSymbol": ""
+    },
+    "fiatTransactionAmount": "0",
+    "fiatTransactionFee": "0.05",
+    "fiatTransactionTotal": "0.05",
+    "ethTransactionAmount": "0",
+    "ethTransactionFee": "0.000233",
+    "ethTransactionTotal": "0.000233",
+    "hexGasTotal": "0xd42f28057e00",
+    "nonce": "",
+    "toSmartContract": false,
+    "fetchingData": false
+  },
+  "localeMessages": {},
+  "metamask": {
+    "isInitialized": true,
+    "isUnlocked": true,
+    "isAccountMenuOpen": false,
+    "isPopup": false,
+    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "identities": {
+      "0x8cf82b5aa41ff2282427be151dd328568684007a": {
+        "address": "0x8cf82b5aa41ff2282427be151dd328568684007a",
+        "name": "Account 3"
+      },
+      "0xbe1a00e10ec68b154adb84e8119167146a71c9a2": {
+        "address": "0xbe1a00e10ec68b154adb84e8119167146a71c9a2",
+        "name": "Account 2"
+      },
+      "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2": {
+        "address": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+        "name": "Account 1"
+      }
+    },
+    "unapprovedTxs": {
+      "2389644572638771": {
+        "estimatedGas": "0x8544",
+        "gasLimitSpecified": true,
+        "gasPriceSpecified": true,
+        "history": [],
+        "id": 2389644572638771,
+        "loadingDefaults": false,
+        "metamaskNetworkId": "4",
+        "origin": "MetaMask",
+        "status": "unapproved",
+        "time": 1538844175144,
+        "txParams": {
+          "data": "0xa9059cbb000000000000000000000000be1a00e10ec68b154adb84e8119167146a71c9a20000000000000000000000000000000000000000000000000000000000000000",
+          "from": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+          "gas": "0x8544",
+          "gasPrice": "0x3b9aca00",
+          "to": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
+          "value": "0x0"
+        },
+        "type": "standard"
+      },
+      "2389644572638772": {
+        "estimatedGas": "0x5208",
+        "gasLimitSpecified": true,
+        "gasPriceSpecified": true,
+        "history": [],
+        "id": 2389644572638772,
+        "loadingDefaults": false,
+        "metamaskNetworkId": "4",
+        "origin": "MetaMask",
+        "status": "unapproved",
+        "time": 1538844178492,
+        "txParams": {
+          "from": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+          "gas": "0x5208",
+          "gasPrice": "0x3b9aca00",
+          "to": "0xbe1a00e10ec68b154adb84e8119167146a71c9a2",
+          "value": "0x0"
+        },
+        "type": "standard"
+      },
+      "2389644572638773": {
+        "estimatedGas": {
+          "length": 1,
+          "negative": 0,
+          "red": null,
+          "words": [34061, null]
+        },
+        "gasLimitSpecified": false,
+        "gasPriceSpecified": true,
+        "history": [],
+        "id": 2389644572638773,
+        "loadingDefaults": false,
+        "metamaskNetworkId": "4",
+        "origin": "localhost",
+        "status": "unapproved",
+        "time": 1538844204724,
+        "txParams": {
+          "data": "0xdfb29935000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000155468697320697320746865206970667320686173680000000000000000000000",
+          "from": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+          "gas": "0xc793",
+          "gasPrice": "0x3b9aca00",
+          "to": "0xb7ec370c889b3b48ec537e0b2c887faedceb254a",
+          "value": "0x0"
+        },
+        "type": "standard"
+      },
+      "2389644572638774": {
+        "estimatedGas": "0x38f53",
+        "gasLimitSpecified": true,
+        "gasPriceSpecified": false,
+        "history": [],
+        "id": 2389644572638774,
+        "loadingDefaults": false,
+        "metamaskNetworkId": "4",
+        "origin": "remix.ethereum.org",
+        "status": "unapproved",
+        "time": 1538844223352,
+        "txParams": {
+          "data": "0x608060405234801561001057600080fd5b506102a7806100206000396000f30060806040526004361061004b5763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663d13319c48114610050578063dfb29935146100da575b600080fd5b34801561005c57600080fd5b50610065610135565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561009f578181015183820152602001610087565b50505050905090810190601f1680156100cc5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156100e657600080fd5b506040805160206004803580820135601f81018490048402850184019095528484526101339436949293602493928401919081908401838280828437509497506101cc9650505050505050565b005b60008054604080516020601f60026000196101006001881615020190951694909404938401819004810282018101909252828152606093909290918301828280156101c15780601f10610196576101008083540402835291602001916101c1565b820191906000526020600020905b8154815290600101906020018083116101a457829003601f168201915b505050505090505b90565b80516101df9060009060208401906101e3565b5050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061022457805160ff1916838001178555610251565b82800160010185558215610251579182015b82811115610251578251825591602001919060010190610236565b5061025d929150610261565b5090565b6101c991905b8082111561025d57600081556001016102675600a165627a7a72305820cf4282c534b8f2faad947d592afa109b907e4e6b2f52335b361b69c24fedb9580029",
+          "from": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+          "gas": "0x38f53",
+          "gasPrice": "0x3b9aca00",
+          "value": "0x0"
+        },
+        "type": "standard"
+      }
+    },
+    "noActiveNotices": true,
+    "frequentRpcList": [],
+    "addressBook": [],
+    "selectedTokenAddress": null,
+    "contractExchangeRates": {},
+    "tokenExchangeRates": {},
+    "tokens": [
+      {
+        "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
+        "decimals": 9,
+        "symbol": "DGD"
+      }
+    ],
+    "pendingTokens": {},
+    "send": {
+      "gasLimit": null,
+      "gasPrice": null,
+      "gasTotal": null,
+      "tokenBalance": null,
+      "from": "",
+      "to": "",
+      "amount": "0x0",
+      "memo": "",
+      "errors": {},
+      "editingTransactionId": null,
+      "forceGasMin": null
+    },
+    "coinOptions": {},
+    "useBlockie": false,
+    "featureFlags": {
+      "betaUI": true,
+      "skipAnnounceBetaUI": true
+    },
+    "isRevealingSeedWords": false,
+    "welcomeScreenSeen": false,
+    "currentLocale": "en",
+    "preferences": {
+      "useETHAsPrimaryCurrency": true
+    },
+    "provider": {
+      "type": "rinkeby"
+    },
+    "network": "4",
+    "accounts": {
+      "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2": {
+        "address": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+        "balance": "0x36aabfb2a0190c00"
+      },
+      "0xbe1a00e10ec68b154adb84e8119167146a71c9a2": {
+        "address": "0xbe1a00e10ec68b154adb84e8119167146a71c9a2",
+        "balance": "0x7b3ef08c294a000"
+      },
+      "0x8cf82b5aa41ff2282427be151dd328568684007a": {
+        "address": "0x8cf82b5aa41ff2282427be151dd328568684007a",
+        "balance": "0x0"
+      }
+    },
+    "currentBlockGasLimit": "0x731e25",
+    "selectedAddressTxList": [],
+    "unapprovedMsgs": {},
+    "unapprovedMsgCount": 0,
+    "unapprovedPersonalMsgs": {},
+    "unapprovedPersonalMsgCount": 0,
+    "unapprovedTypedMessages": {},
+    "unapprovedTypedMessagesCount": 0,
+    "keyringTypes": [
+      "Simple Key Pair",
+      "HD Key Tree",
+      "Trezor Hardware",
+      "Ledger Hardware",
+      "Lattice Hardware"
+    ],
+    "keyrings": [
+      {
+        "type": "HD Key Tree",
+        "accounts": [
+          "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+          "0xbe1a00e10ec68b154adb84e8119167146a71c9a2",
+          "0x8cf82b5aa41ff2282427be151dd328568684007a"
+        ]
+      }
+    ],
+    "currentAccountTab": "history",
+    "accountTokens": {
+      "0x8cf82b5aa41ff2282427be151dd328568684007a": {},
+      "0xbe1a00e10ec68b154adb84e8119167146a71c9a2": {},
+      "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2": {
+        "rinkeby": [
+          {
+            "address": "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a",
+            "decimals": 9,
+            "symbol": "DGD"
+          },
+          {
+            "address": "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359",
+            "decimals": 18,
+            "symbol": "DAI"
+          }
+        ]
+      }
+    },
+    "assetImages": {
+      "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359": null,
+      "0xe0b7927c4af23765cb51314a0e0521a9645f0e2a": null
+    },
+    "suggestedTokens": {},
+    "lostIdentities": {},
+    "seedWords": null,
+    "forgottenPassword": false,
+    "selectedAddress": "0xe2f12a09ba1098312a7d1cad7581ed253ca5f4b2",
+    "recentBlocks": [],
+    "currentCurrency": "usd",
+    "conversionRate": 225.23,
+    "conversionDate": 1538859376,
+    "shapeShiftTxList": [],
+    "infuraNetworkStatus": {
+      "kovan": "ok",
+      "mainnet": "ok",
+      "rinkeby": "ok",
+      "ropsten": "ok",
+      "goerli": "ok"
+    }
+  },
+  "send": {
+    "toDropdownOpen": false,
+    "errors": {},
+    "warnings": {}
+  }
+}
diff --git a/lavamoat/browserify/policy.json b/lavamoat/browserify/policy.json
index 1cd3d2110..3cfd712fa 100644
--- a/lavamoat/browserify/policy.json
+++ b/lavamoat/browserify/policy.json
@@ -325,6 +325,7 @@
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
         "@ethersproject/keccak256": true,
+        "@ethersproject/logger": true,
         "@ethersproject/sha2": true,
         "@ethersproject/strings": true
       }
@@ -655,9 +656,6 @@
     "@sentry/browser": {
       "globals": {
         "XMLHttpRequest": true,
-        "document.body": true,
-        "document.createElement": true,
-        "document.head": true,
         "setTimeout": true
       },
       "packages": {
@@ -682,9 +680,11 @@
     },
     "@sentry/hub": {
       "globals": {
-        "setTimeout": true
+        "clearInterval": true,
+        "setInterval": true
       },
       "packages": {
+        "@sentry/types": true,
         "@sentry/utils": true,
         "tslib": true
       }
@@ -945,6 +945,11 @@
         "safe-buffer": true
       }
     },
+    "bitwise": {
+      "packages": {
+        "buffer": true
+      }
+    },
     "bl": {
       "packages": {
         "buffer": true,
@@ -1551,11 +1556,15 @@
     },
     "eth-json-rpc-middleware": {
       "globals": {
+        "URL": true,
+        "btoa": true,
         "console.error": true,
         "fetch": true,
         "setTimeout": true
       },
       "packages": {
+        "@metamask/safe-event-emitter": true,
+        "browser-resolve": true,
         "btoa": true,
         "clone": true,
         "eth-rpc-errors": true,
@@ -1581,6 +1590,26 @@
         "obs-store": true
       }
     },
+    "eth-lattice-keyring": {
+      "globals": {
+        "addEventListener": true,
+        "browser": true,
+        "clearInterval": true,
+        "console.warn": true,
+        "open": true,
+        "setInterval": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
+        "bignumber.js": true,
+        "buffer": true,
+        "crypto-browserify": true,
+        "ethereumjs-util": true,
+        "events": true,
+        "gridplus-sdk": true
+      }
+    },
     "eth-method-registry": {
       "packages": {
         "ethjs": true
@@ -1736,6 +1765,11 @@
         "@ethersproject/wordlists": true
       }
     },
+    "ethers-eip712": {
+      "packages": {
+        "ethers": true
+      }
+    },
     "ethjs": {
       "globals": {
         "clearInterval": true,
@@ -1912,6 +1946,29 @@
         "cross-fetch": true
       }
     },
+    "gridplus-sdk": {
+      "globals": {
+        "console.error": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "aes-js": true,
+        "bech32": true,
+        "bignumber.js": true,
+        "bitwise": true,
+        "borc": true,
+        "bs58check": true,
+        "buffer": true,
+        "crc-32": true,
+        "elliptic": true,
+        "ethers": true,
+        "ethers-eip712": true,
+        "js-sha3": true,
+        "rlp-browser": true,
+        "secp256k1": true,
+        "superagent": true
+      }
+    },
     "hamt-sharding": {
       "packages": {
         "is-buffer": true,
@@ -4100,6 +4157,12 @@
         "buffer": true
       }
     },
+    "rlp-browser": {
+      "packages": {
+        "assert": true,
+        "buffer": true
+      }
+    },
     "rn-host-detect": {
       "globals": {
         "__DEV__": true,
@@ -4379,6 +4442,21 @@
         "is-hex-prefixed": true
       }
     },
+    "superagent": {
+      "globals": {
+        "ActiveXObject": true,
+        "XMLHttpRequest": true,
+        "btoa": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.trace": true,
+        "console.warn": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "component-emitter": true
+      }
+    },
     "textarea-caret": {
       "globals": {
         "document.body.appendChild": true,
diff --git a/lavamoat/node/policy-override.json b/lavamoat/node/policy-override.json
index 85e84f001..eaa6b9b26 100644
--- a/lavamoat/node/policy-override.json
+++ b/lavamoat/node/policy-override.json
@@ -1,13 +1,5 @@
 {
   "resources": {
-    "node-sass": {
-      "native": true
-    },
-    "module-deps": {
-      "packages": {
-        "loose-envify": true
-      }
-    },
     "@babel/core": {
       "packages": {
         "<root>": true,
@@ -20,6 +12,34 @@
         "@babel/plugin-proposal-nullish-coalescing-operator": true
       }
     },
+    "@eslint/eslintrc": {
+      "packages": {
+        "@babel/eslint-parser": true,
+        "@babel/eslint-plugin": true,
+        "@metamask/eslint-config": true,
+        "@metamask/eslint-config-nodejs": true,
+        "eslint": true,
+        "eslint-config-prettier": true,
+        "eslint-plugin-import": true,
+        "eslint-plugin-node": true,
+        "eslint-plugin-prettier": true,
+        "eslint-plugin-react": true,
+        "eslint-plugin-react-hooks": true
+      }
+    },
+    "eslint-module-utils": {
+      "packages": {
+        "eslint-import-resolver-node": true
+      }
+    },
+    "node-sass": {
+      "native": true
+    },
+    "module-deps": {
+      "packages": {
+        "loose-envify": true
+      }
+    },
     "sass": {
       "env": "unfrozen",
       "builtin": {
diff --git a/lavamoat/node/policy.json b/lavamoat/node/policy.json
index f12ad2325..a9073f4cd 100644
--- a/lavamoat/node/policy.json
+++ b/lavamoat/node/policy.json
@@ -41,6 +41,20 @@
         "source-map": true
       }
     },
+    "@babel/eslint-parser": {
+      "packages": {
+        "@babel/core": true,
+        "eslint-scope": true,
+        "eslint-visitor-keys": true,
+        "semver": true
+      }
+    },
+    "@babel/eslint-plugin": {
+      "packages": {
+        "eslint": true,
+        "eslint-rule-composer": true
+      }
+    },
     "@babel/generator": {
       "globals": {
         "console.error": true
@@ -815,7 +829,6 @@
         "espree": true,
         "globals": true,
         "ignore": true,
-        "import-fresh": true,
         "js-yaml": true,
         "minimatch": true,
         "strip-json-comments": true
@@ -1028,6 +1041,15 @@
         "make-iterator": true
       }
     },
+    "array-includes": {
+      "packages": {
+        "call-bind": true,
+        "define-properties": true,
+        "es-abstract": true,
+        "get-intrinsic": true,
+        "is-string": true
+      }
+    },
     "array-initial": {
       "packages": {
         "array-slice": true,
@@ -1044,6 +1066,19 @@
         "array-uniq": true
       }
     },
+    "array.prototype.flat": {
+      "packages": {
+        "define-properties": true,
+        "es-abstract": true
+      }
+    },
+    "array.prototype.flatmap": {
+      "packages": {
+        "call-bind": true,
+        "define-properties": true,
+        "es-abstract": true
+      }
+    },
     "async-done": {
       "builtin": {
         "domain.create": true
@@ -1330,6 +1365,12 @@
         "process.cwd": true
       }
     },
+    "call-bind": {
+      "packages": {
+        "function-bind": true,
+        "get-intrinsic": true
+      }
+    },
     "chalk": {
       "globals": {
         "process.env.TERM": true,
@@ -1345,6 +1386,7 @@
       "builtin": {
         "events.EventEmitter": true,
         "fs": true,
+        "os.type": true,
         "path.basename": true,
         "path.dirname": true,
         "path.extname": true,
@@ -1479,6 +1521,11 @@
         "typedarray": true
       }
     },
+    "contains-path": {
+      "builtin": {
+        "path.normalize": true
+      }
+    },
     "convert-source-map": {
       "builtin": {
         "fs.readFileSync": true,
@@ -1657,7 +1704,8 @@
         "assert": true
       },
       "packages": {
-        "esutils": true
+        "esutils": true,
+        "isarray": true
       }
     },
     "dom-serializer": {
@@ -1731,9 +1779,22 @@
         "WeakRef": true
       },
       "packages": {
+        "call-bind": true,
+        "es-to-primitive": true,
         "function-bind": true,
+        "get-intrinsic": true,
         "has": true,
-        "has-symbols": true
+        "has-symbols": true,
+        "is-callable": true,
+        "is-regex": true,
+        "object-inspect": true
+      }
+    },
+    "es-to-primitive": {
+      "packages": {
+        "is-callable": true,
+        "is-date-object": true,
+        "is-symbol": true
       }
     },
     "es5-ext": {
@@ -1844,6 +1905,141 @@
         "regexpp": true
       }
     },
+    "eslint-config-prettier": {
+      "globals": {
+        "process.env.ESLINT_CONFIG_PRETTIER_NO_DEPRECATED": true
+      }
+    },
+    "eslint-import-resolver-node": {
+      "builtin": {
+        "path.dirname": true,
+        "path.resolve": true
+      },
+      "packages": {
+        "debug": true,
+        "resolve": true
+      }
+    },
+    "eslint-module-utils": {
+      "builtin": {
+        "crypto.createHash": true,
+        "fs.existsSync": true,
+        "fs.readdirSync": true,
+        "module": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.join": true,
+        "path.parse": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "__dirname": true,
+        "console.warn": true,
+        "process.cwd": true,
+        "process.hrtime": true
+      },
+      "packages": {
+        "debug": true,
+        "pkg-dir": true
+      }
+    },
+    "eslint-plugin-es": {
+      "packages": {
+        "eslint-utils": true,
+        "regexpp": true
+      }
+    },
+    "eslint-plugin-import": {
+      "builtin": {
+        "fs": true,
+        "path": true,
+        "vm": true
+      },
+      "globals": {
+        "process.cwd": true,
+        "process.env": true
+      },
+      "packages": {
+        "array-includes": true,
+        "array.prototype.flat": true,
+        "contains-path": true,
+        "debug": true,
+        "doctrine": true,
+        "eslint": true,
+        "eslint-module-utils": true,
+        "has": true,
+        "minimatch": true,
+        "object.values": true,
+        "read-pkg-up": true,
+        "resolve": true,
+        "tsconfig-paths": true,
+        "typescript": true
+      }
+    },
+    "eslint-plugin-node": {
+      "builtin": {
+        "fs.readFileSync": true,
+        "fs.readdirSync": true,
+        "fs.statSync": true,
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true,
+        "path.isAbsolute": true,
+        "path.join": true,
+        "path.relative": true,
+        "path.resolve": true,
+        "path.sep": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
+      "packages": {
+        "eslint-plugin-es": true,
+        "eslint-utils": true,
+        "ignore": true,
+        "minimatch": true,
+        "resolve": true,
+        "semver": true
+      }
+    },
+    "eslint-plugin-prettier": {
+      "packages": {
+        "prettier": true,
+        "prettier-linter-helpers": true
+      }
+    },
+    "eslint-plugin-react": {
+      "builtin": {
+        "fs.statSync": true,
+        "path.dirname": true,
+        "path.extname": true
+      },
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "process.argv.join": true,
+        "process.cwd": true
+      },
+      "packages": {
+        "array-includes": true,
+        "array.prototype.flatmap": true,
+        "doctrine": true,
+        "has": true,
+        "jsx-ast-utils": true,
+        "minimatch": true,
+        "object.entries": true,
+        "object.fromentries": true,
+        "object.values": true,
+        "prop-types": true,
+        "resolve": true,
+        "string.prototype.matchall": true
+      }
+    },
+    "eslint-plugin-react-hooks": {
+      "globals": {
+        "process.env.NODE_ENV": true
+      }
+    },
     "eslint-scope": {
       "builtin": {
         "assert": true
@@ -2042,6 +2238,17 @@
         "to-regex-range": true
       }
     },
+    "find-up": {
+      "builtin": {
+        "path.dirname": true,
+        "path.join": true,
+        "path.parse": true,
+        "path.resolve": true
+      },
+      "packages": {
+        "locate-path": true
+      }
+    },
     "first-chunk-stream": {
       "builtin": {
         "util.inherits": true
@@ -2173,6 +2380,18 @@
         "assert.equal": true
       }
     },
+    "get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "function-bind": true,
+        "has": true,
+        "has-symbols": true
+      }
+    },
     "get-stream": {
       "builtin": {
         "stream.PassThrough": true
@@ -2542,6 +2761,12 @@
         "kind-of": true
       }
     },
+    "hosted-git-info": {
+      "builtin": {
+        "url.URL": true,
+        "url.parse": true
+      }
+    },
     "htmlparser2": {
       "builtin": {
         "buffer.Buffer": true,
@@ -2627,6 +2852,13 @@
         "xtend": true
       }
     },
+    "internal-slot": {
+      "packages": {
+        "get-intrinsic": true,
+        "has": true,
+        "side-channel": true
+      }
+    },
     "is-absolute": {
       "packages": {
         "is-relative": true,
@@ -2652,6 +2884,11 @@
         "binary-extensions": true
       }
     },
+    "is-callable": {
+      "globals": {
+        "document": true
+      }
+    },
     "is-core-module": {
       "globals": {
         "process.versions": true
@@ -2726,11 +2963,22 @@
         "isobject": true
       }
     },
+    "is-regex": {
+      "packages": {
+        "call-bind": true,
+        "has-symbols": true
+      }
+    },
     "is-relative": {
       "packages": {
         "is-unc-path": true
       }
     },
+    "is-symbol": {
+      "packages": {
+        "has-symbols": true
+      }
+    },
     "is-unc-path": {
       "packages": {
         "unc-path-regex": true
@@ -2796,6 +3044,14 @@
         "Buffer": true
       }
     },
+    "jsx-ast-utils": {
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "object.assign": true
+      }
+    },
     "just-debounce": {
       "globals": {
         "clearTimeout": true,
@@ -2912,6 +3168,29 @@
         "type-check": true
       }
     },
+    "load-json-file": {
+      "builtin": {
+        "path.relative": true
+      },
+      "packages": {
+        "graceful-fs": true,
+        "parse-json": true,
+        "pify": true,
+        "strip-bom": true
+      }
+    },
+    "locate-path": {
+      "builtin": {
+        "path.resolve": true
+      },
+      "globals": {
+        "process.cwd": true
+      },
+      "packages": {
+        "p-locate": true,
+        "path-exists": true
+      }
+    },
     "lodash": {
       "globals": {
         "define": true
@@ -3159,6 +3438,18 @@
         "setTimeout": true
       }
     },
+    "normalize-package-data": {
+      "builtin": {
+        "url.parse": true,
+        "util.format": true
+      },
+      "packages": {
+        "hosted-git-info": true,
+        "resolve": true,
+        "semver": true,
+        "validate-npm-package-license": true
+      }
+    },
     "normalize-path": {
       "packages": {
         "remove-trailing-separator": true
@@ -3196,6 +3487,7 @@
     },
     "object.assign": {
       "packages": {
+        "call-bind": true,
         "define-properties": true,
         "es-abstract": true,
         "has-symbols": true,
@@ -3210,6 +3502,21 @@
         "isobject": true
       }
     },
+    "object.entries": {
+      "packages": {
+        "call-bind": true,
+        "define-properties": true,
+        "es-abstract": true,
+        "has": true
+      }
+    },
+    "object.fromentries": {
+      "packages": {
+        "call-bind": true,
+        "define-properties": true,
+        "es-abstract": true
+      }
+    },
     "object.omit": {
       "packages": {
         "for-own": true,
@@ -3227,6 +3534,14 @@
         "make-iterator": true
       }
     },
+    "object.values": {
+      "packages": {
+        "call-bind": true,
+        "define-properties": true,
+        "es-abstract": true,
+        "has": true
+      }
+    },
     "once": {
       "packages": {
         "wrappy": true
@@ -3240,6 +3555,16 @@
         "readable-stream": true
       }
     },
+    "p-limit": {
+      "packages": {
+        "p-try": true
+      }
+    },
+    "p-locate": {
+      "packages": {
+        "p-limit": true
+      }
+    },
     "parent-module": {
       "packages": {
         "callsites": true
@@ -3289,6 +3614,12 @@
         "process.platform": true
       }
     },
+    "path-exists": {
+      "builtin": {
+        "fs.access": true,
+        "fs.accessSync": true
+      }
+    },
     "path-is-absolute": {
       "globals": {
         "process.platform": true
@@ -3329,6 +3660,9 @@
       "builtin": {
         "fs": true,
         "util.promisify": true
+      },
+      "packages": {
+        "pify": true
       }
     },
     "pause-stream": {
@@ -3358,6 +3692,14 @@
         "pinkie": true
       }
     },
+    "pkg-dir": {
+      "builtin": {
+        "path.dirname": true
+      },
+      "packages": {
+        "find-up": true
+      }
+    },
     "plugin-error": {
       "builtin": {
         "util.inherits": true
@@ -3444,11 +3786,62 @@
         "postcss": true
       }
     },
+    "prettier": {
+      "builtin": {
+        "assert": true,
+        "events": true,
+        "fs": true,
+        "module": true,
+        "os": true,
+        "path": true,
+        "stream": true,
+        "tty": true,
+        "util": true
+      },
+      "globals": {
+        "Buffer": true,
+        "Intl": true,
+        "PerformanceObserver": true,
+        "WorkerGlobalScope": true,
+        "XMLHttpRequest": true,
+        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
+        "YAML_SILENCE_WARNINGS": true,
+        "__dirname": true,
+        "__filename": true,
+        "atob": true,
+        "btoa": true,
+        "clearTimeout": true,
+        "console": true,
+        "define": true,
+        "document": true,
+        "localStorage": true,
+        "navigator": true,
+        "performance": true,
+        "process": true,
+        "setImmediate": true,
+        "setTimeout": true
+      }
+    },
+    "prettier-linter-helpers": {
+      "packages": {
+        "fast-diff": true
+      }
+    },
     "process-nextick-args": {
       "globals": {
         "process": true
       }
     },
+    "prop-types": {
+      "globals": {
+        "console": true,
+        "process.env.NODE_ENV": true
+      },
+      "packages": {
+        "object-assign": true,
+        "react-is": true
+      }
+    },
     "pump": {
       "builtin": {
         "fs": true
@@ -3519,11 +3912,33 @@
         "strip-json-comments": true
       }
     },
+    "react-is": {
+      "globals": {
+        "console": true,
+        "process.env.NODE_ENV": true
+      }
+    },
     "read-only-stream": {
       "packages": {
         "readable-stream": true
       }
     },
+    "read-pkg": {
+      "builtin": {
+        "path.join": true
+      },
+      "packages": {
+        "load-json-file": true,
+        "normalize-package-data": true,
+        "path-type": true
+      }
+    },
+    "read-pkg-up": {
+      "packages": {
+        "find-up": true,
+        "read-pkg": true
+      }
+    },
     "readable-stream": {
       "builtin": {
         "buffer.Buffer": true,
@@ -3563,6 +3978,7 @@
       },
       "globals": {
         "process.platform": true,
+        "process.versions.node.split": true,
         "setImmediate": true
       },
       "packages": {
@@ -3597,6 +4013,12 @@
         "safe-regex": true
       }
     },
+    "regexp.prototype.flags": {
+      "packages": {
+        "call-bind": true,
+        "define-properties": true
+      }
+    },
     "regexpu-core": {
       "packages": {
         "regenerate": true,
@@ -3855,6 +4277,13 @@
         "shebang-regex": true
       }
     },
+    "side-channel": {
+      "packages": {
+        "call-bind": true,
+        "get-intrinsic": true,
+        "object-inspect": true
+      }
+    },
     "signal-exit": {
       "builtin": {
         "assert.equal": true,
@@ -3933,6 +4362,22 @@
         "urix": true
       }
     },
+    "source-map-support": {
+      "builtin": {
+        "fs": true,
+        "path.dirname": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "XMLHttpRequest": true,
+        "console.error": true,
+        "process": true
+      },
+      "packages": {
+        "buffer-from": true,
+        "source-map": true
+      }
+    },
     "source-map-url": {
       "globals": {
         "define": true
@@ -3943,6 +4388,22 @@
         "define": true
       }
     },
+    "spdx-correct": {
+      "packages": {
+        "spdx-license-ids": true
+      }
+    },
+    "spdx-expression-parse": {
+      "builtin": {
+        "fs.readFileSync": true,
+        "path.normalize": true
+      },
+      "globals": {
+        "console.log": true,
+        "process.argv.slice": true,
+        "process.exit": true
+      }
+    },
     "specificity": {
       "globals": {
         "define": true
@@ -4039,6 +4500,16 @@
         "strip-ansi": true
       }
     },
+    "string.prototype.matchall": {
+      "packages": {
+        "call-bind": true,
+        "define-properties": true,
+        "es-abstract": true,
+        "has-symbols": true,
+        "internal-slot": true,
+        "regexp.prototype.flags": true
+      }
+    },
     "string_decoder": {
       "builtin": {
         "buffer.Buffer": true
@@ -4292,6 +4763,21 @@
         "through2": true
       }
     },
+    "tsconfig-paths": {
+      "builtin": {
+        "fs.existsSync": true,
+        "fs.lstatSync": true,
+        "fs.readFileSync": true,
+        "fs.statSync": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true
+      },
+      "packages": {
+        "json5": true,
+        "strip-bom": true
+      }
+    },
     "type-check": {
       "packages": {
         "prelude-ls": true
@@ -4305,6 +4791,51 @@
         "is-typedarray": true
       }
     },
+    "typescript": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "crypto": true,
+        "fs.closeSync": true,
+        "fs.mkdirSync": true,
+        "fs.openSync": true,
+        "fs.readFileSync": true,
+        "fs.readdirSync": true,
+        "fs.realpathSync": true,
+        "fs.statSync": true,
+        "fs.unlinkSync": true,
+        "fs.unwatchFile": true,
+        "fs.utimesSync": true,
+        "fs.watch": true,
+        "fs.watchFile": true,
+        "fs.writeFileSync": true,
+        "fs.writeSync": true,
+        "inspector": true,
+        "os.EOL": true,
+        "os.platform": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true
+      },
+      "globals": {
+        "Intl": true,
+        "TypeScript": "write",
+        "__dirname": true,
+        "__filename": true,
+        "__magic__": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "gc": true,
+        "globalThis": "write",
+        "onProfilerEvent": true,
+        "performance": true,
+        "process": true,
+        "setTimeout": true,
+        "toolsVersion": "write"
+      },
+      "packages": {
+        "source-map-support": true
+      }
+    },
     "undeclared-identifiers": {
       "packages": {
         "acorn-node": true,
@@ -4422,6 +4953,12 @@
         "util.deprecate": true
       }
     },
+    "validate-npm-package-license": {
+      "packages": {
+        "spdx-correct": true,
+        "spdx-expression-parse": true
+      }
+    },
     "vfile": {
       "builtin": {
         "path.basename": true,
diff --git a/package.json b/package.json
index 7185aa783..1d8b2c01f 100644
--- a/package.json
+++ b/package.json
@@ -110,14 +110,14 @@
     "@metamask/eth-token-tracker": "^3.0.1",
     "@metamask/etherscan-link": "^2.1.0",
     "@metamask/jazzicon": "^2.0.0",
-    "@metamask/logo": "^3.0.1",
+    "@metamask/logo": "^3.1.0",
     "@metamask/obs-store": "^5.0.0",
     "@metamask/post-message-stream": "^4.0.0",
     "@metamask/providers": "^8.1.1",
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "^1.6.2",
-    "@sentry/browser": "^5.26.0",
-    "@sentry/integrations": "^5.26.0",
+    "@sentry/browser": "^6.0.0",
+    "@sentry/integrations": "^6.0.0",
     "@zxing/library": "^0.8.0",
     "analytics-node": "^3.4.0-beta.3",
     "await-semaphore": "^0.1.1",
@@ -135,9 +135,10 @@
     "eth-ens-namehash": "^2.0.8",
     "eth-json-rpc-filters": "^4.2.1",
     "eth-json-rpc-infura": "^5.1.0",
-    "eth-json-rpc-middleware": "^6.0.0",
+    "eth-json-rpc-middleware": "^8.0.0",
     "eth-keyring-controller": "^6.2.0",
     "eth-method-registry": "^2.0.0",
+    "eth-lattice-keyring": "^0.3.0",
     "eth-query": "^2.1.2",
     "eth-rpc-errors": "^4.0.2",
     "eth-sig-util": "^3.0.0",
@@ -229,16 +230,18 @@
     "@metamask/forwarder": "^1.1.0",
     "@metamask/test-dapp": "^4.0.1",
     "@sentry/cli": "^1.58.0",
-    "@storybook/addon-actions": "^6.1.17",
-    "@storybook/addon-backgrounds": "^6.1.17",
-    "@storybook/addon-knobs": "^6.1.17",
-    "@storybook/addon-toolbars": "^6.1.17",
-    "@storybook/addons": "^6.1.7",
-    "@storybook/api": "^6.1.7",
-    "@storybook/components": "^6.1.7",
-    "@storybook/core": "^6.1.17",
-    "@storybook/react": "^6.1.17",
-    "@storybook/storybook-deployer": "^2.8.7",
+    "@storybook/addon-a11y": "^6.3.12",
+    "@storybook/addon-actions": "^6.3.12",
+    "@storybook/addon-essentials": "^6.3.12",
+    "@storybook/addon-knobs": "^6.3.1",
+    "@storybook/addons": "^6.3.12",
+    "@storybook/api": "^6.3.12",
+    "@storybook/components": "^6.3.12",
+    "@storybook/core": "^6.3.12",
+    "@storybook/core-events": "^6.3.0",
+    "@storybook/react": "^6.3.12",
+    "@storybook/storybook-deployer": "^2.8.10",
+    "@storybook/theming": "^6.3.0",
     "@testing-library/jest-dom": "^5.11.10",
     "@testing-library/react": "^10.4.8",
     "@testing-library/react-hooks": "^3.2.1",
@@ -249,7 +252,7 @@
     "brfs": "^2.0.2",
     "browserify": "^16.5.1",
     "chalk": "^3.0.0",
-    "chromedriver": "^93.0.1",
+    "chromedriver": "^95.0.0",
     "concurrently": "^5.2.0",
     "copy-webpack-plugin": "^6.0.3",
     "cross-spawn": "^7.0.3",
@@ -263,6 +266,7 @@
     "enzyme-adapter-react-16": "^1.15.1",
     "eslint": "^7.23.0",
     "eslint-config-prettier": "^8.1.0",
+    "eslint-import-resolver-node": "^0.3.4",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^24.3.4",
     "eslint-plugin-mocha": "^8.1.0",
@@ -276,6 +280,7 @@
     "ganache-cli": "^6.12.1",
     "ganache-core": "^2.13.1",
     "geckodriver": "^1.21.0",
+    "globby": "^11.0.4",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^5.0.0",
     "gulp-dart-sass": "^1.0.2",
@@ -333,7 +338,7 @@
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "vinyl-sourcemaps-apply": "^0.2.1",
-    "watchify": "^3.11.1",
+    "watchify": "^4.0.0",
     "webpack": "^4.41.6",
     "yargs": "^17.0.1",
     "yarn-deduplicate": "^3.1.0"
@@ -344,6 +349,7 @@
   },
   "lavamoat": {
     "allowScripts": {
+      "gridplus-sdk": false,
       "chromedriver": true,
       "geckodriver": true,
       "@sentry/cli": true,
diff --git a/patches/@eslint+eslintrc+0.4.0.patch b/patches/@eslint+eslintrc+0.4.0.patch
new file mode 100644
index 000000000..c469c7c84
--- /dev/null
+++ b/patches/@eslint+eslintrc+0.4.0.patch
@@ -0,0 +1,21 @@
+diff --git a/node_modules/@eslint/eslintrc/lib/config-array-factory.js b/node_modules/@eslint/eslintrc/lib/config-array-factory.js
+index c7ff6a0..6a88c6d 100644
+--- a/node_modules/@eslint/eslintrc/lib/config-array-factory.js
++++ b/node_modules/@eslint/eslintrc/lib/config-array-factory.js
+@@ -41,7 +41,6 @@
+ 
+ const fs = require("fs");
+ const path = require("path");
+-const importFresh = require("import-fresh");
+ const stripComments = require("strip-json-comments");
+ const ConfigValidator = require("./shared/config-validator");
+ const naming = require("./shared/naming");
+@@ -222,7 +221,7 @@ function loadLegacyConfigFile(filePath) {
+ function loadJSConfigFile(filePath) {
+     debug(`Loading JS config file: ${filePath}`);
+     try {
+-        return importFresh(filePath);
++        return require(filePath);
+     } catch (e) {
+         debug(`Error reading JavaScript file: ${filePath}`);
+         e.message = `Cannot read config file: ${filePath}\nError: ${e.message}`;
diff --git a/patches/eslint+7.23.0.patch b/patches/eslint+7.23.0.patch
new file mode 100644
index 000000000..8582fadc6
--- /dev/null
+++ b/patches/eslint+7.23.0.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/eslint/lib/linter/linter.js b/node_modules/eslint/lib/linter/linter.js
+index adb5c21..4a4be92 100644
+--- a/node_modules/eslint/lib/linter/linter.js
++++ b/node_modules/eslint/lib/linter/linter.js
+@@ -560,7 +560,7 @@ function resolveParserOptions(parserName, providedOptions, enabledEnvironments)
+  */
+ function resolveGlobals(providedGlobals, enabledEnvironments) {
+     return Object.assign(
+-        {},
++        Object.create(null),
+         ...enabledEnvironments.filter(env => env.globals).map(env => env.globals),
+         providedGlobals
+     );
diff --git a/patches/object.values+1.1.1.patch b/patches/object.values+1.1.1.patch
new file mode 100644
index 000000000..f0323c184
--- /dev/null
+++ b/patches/object.values+1.1.1.patch
@@ -0,0 +1,23 @@
+diff --git a/node_modules/object.values/index.js b/node_modules/object.values/index.js
+index b8ba091..2dc8083 100644
+--- a/node_modules/object.values/index.js
++++ b/node_modules/object.values/index.js
+@@ -1,17 +1,3 @@
+ 'use strict';
+ 
+-var define = require('define-properties');
+-
+-var implementation = require('./implementation');
+-var getPolyfill = require('./polyfill');
+-var shim = require('./shim');
+-
+-var polyfill = getPolyfill();
+-
+-define(polyfill, {
+-	getPolyfill: getPolyfill,
+-	implementation: implementation,
+-	shim: shim
+-});
+-
+-module.exports = polyfill;
++module.exports = Object.values;
diff --git a/patches/watchify+3.11.1.patch b/patches/watchify+4.0.0.patch
similarity index 96%
rename from patches/watchify+3.11.1.patch
rename to patches/watchify+4.0.0.patch
index cf3e489ad..a5eb2b322 100644
--- a/patches/watchify+3.11.1.patch
+++ b/patches/watchify+4.0.0.patch
@@ -1,11 +1,11 @@
 diff --git a/node_modules/watchify/index.js b/node_modules/watchify/index.js
-index 0753b9f..4fea9e1 100644
+index 0753b9f..05efb1b 100644
 --- a/node_modules/watchify/index.js
 +++ b/node_modules/watchify/index.js
 @@ -58,33 +58,6 @@ function watchify (b, opts) {
          if (pkgcache) pkgcache[file] = pkg;
      });
- 
+     
 -    b.on('reset', reset);
 -    reset();
 -    
diff --git a/shared/constants/gas.js b/shared/constants/gas.js
index ebae444a4..1c0bc8ae7 100644
--- a/shared/constants/gas.js
+++ b/shared/constants/gas.js
@@ -30,6 +30,11 @@ export const GAS_RECOMMENDATIONS = {
   HIGH: 'high',
 };
 
+/**
+ * Represents the user customizing their gas preference
+ */
+export const CUSTOM_GAS_ESTIMATE = 'custom';
+
 /**
  * These represent the different edit modes presented in the UI
  */
diff --git a/shared/constants/hardware-wallets.js b/shared/constants/hardware-wallets.js
index 705754fe7..f32306472 100644
--- a/shared/constants/hardware-wallets.js
+++ b/shared/constants/hardware-wallets.js
@@ -6,6 +6,7 @@
 export const KEYRING_TYPES = {
   LEDGER: 'Ledger Hardware',
   TREZOR: 'Trezor Hardware',
+  LATTICE: 'Lattice Hardware',
 };
 
 /**
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index e9262d750..7f0a3804f 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -110,9 +110,9 @@
  *  the page view
  */
 
-// An empty string "" is a, currently undocumented, way of telling mixpanel
+// An empty string is a, currently undocumented, way of telling mixpanel
 // that these events are meant to be anonymous and not identified to any user
-export const METAMETRICS_ANONYMOUS_ID = '""';
+export const METAMETRICS_ANONYMOUS_ID = '';
 
 /**
  * This object is used to identify events that are triggered by the background
diff --git a/shared/constants/network.js b/shared/constants/network.js
index 3087a68e0..2210605d0 100644
--- a/shared/constants/network.js
+++ b/shared/constants/network.js
@@ -3,6 +3,7 @@ export const RINKEBY = 'rinkeby';
 export const KOVAN = 'kovan';
 export const MAINNET = 'mainnet';
 export const GOERLI = 'goerli';
+export const LOCALHOST = 'localhost';
 export const NETWORK_TYPE_RPC = 'rpc';
 
 export const MAINNET_NETWORK_ID = '1';
@@ -34,6 +35,7 @@ export const RINKEBY_DISPLAY_NAME = 'Rinkeby';
 export const KOVAN_DISPLAY_NAME = 'Kovan';
 export const MAINNET_DISPLAY_NAME = 'Ethereum Mainnet';
 export const GOERLI_DISPLAY_NAME = 'Goerli';
+export const LOCALHOST_DISPLAY_NAME = 'Localhost 8545';
 
 const infuraProjectId = process.env.INFURA_PROJECT_ID;
 const getRpcUrl = (network) =>
@@ -44,6 +46,7 @@ export const RINKEBY_RPC_URL = getRpcUrl('rinkeby');
 export const KOVAN_RPC_URL = getRpcUrl('kovan');
 export const MAINNET_RPC_URL = getRpcUrl('mainnet');
 export const GOERLI_RPC_URL = getRpcUrl('goerli');
+export const LOCALHOST_RPC_URL = 'http://localhost:8545';
 
 export const ETH_SYMBOL = 'ETH';
 export const WETH_SYMBOL = 'WETH';
@@ -63,6 +66,7 @@ export const TEST_CHAINS = [
   RINKEBY_CHAIN_ID,
   GOERLI_CHAIN_ID,
   KOVAN_CHAIN_ID,
+  LOCALHOST_CHAIN_ID,
 ];
 
 /**
@@ -74,6 +78,7 @@ export const NETWORK_TYPE_TO_ID_MAP = {
   [KOVAN]: { networkId: KOVAN_NETWORK_ID, chainId: KOVAN_CHAIN_ID },
   [GOERLI]: { networkId: GOERLI_NETWORK_ID, chainId: GOERLI_CHAIN_ID },
   [MAINNET]: { networkId: MAINNET_NETWORK_ID, chainId: MAINNET_CHAIN_ID },
+  [LOCALHOST]: { networkId: LOCALHOST_NETWORK_ID, chainId: LOCALHOST_CHAIN_ID },
 };
 
 export const NETWORK_TO_NAME_MAP = {
@@ -82,18 +87,21 @@ export const NETWORK_TO_NAME_MAP = {
   [KOVAN]: KOVAN_DISPLAY_NAME,
   [MAINNET]: MAINNET_DISPLAY_NAME,
   [GOERLI]: GOERLI_DISPLAY_NAME,
+  [LOCALHOST]: LOCALHOST_DISPLAY_NAME,
 
   [ROPSTEN_NETWORK_ID]: ROPSTEN_DISPLAY_NAME,
   [RINKEBY_NETWORK_ID]: RINKEBY_DISPLAY_NAME,
   [KOVAN_NETWORK_ID]: KOVAN_DISPLAY_NAME,
   [GOERLI_NETWORK_ID]: GOERLI_DISPLAY_NAME,
   [MAINNET_NETWORK_ID]: MAINNET_DISPLAY_NAME,
+  [LOCALHOST_NETWORK_ID]: LOCALHOST_DISPLAY_NAME,
 
   [ROPSTEN_CHAIN_ID]: ROPSTEN_DISPLAY_NAME,
   [RINKEBY_CHAIN_ID]: RINKEBY_DISPLAY_NAME,
   [KOVAN_CHAIN_ID]: KOVAN_DISPLAY_NAME,
   [GOERLI_CHAIN_ID]: GOERLI_DISPLAY_NAME,
   [MAINNET_CHAIN_ID]: MAINNET_DISPLAY_NAME,
+  [LOCALHOST_CHAIN_ID]: LOCALHOST_DISPLAY_NAME,
 };
 
 export const CHAIN_ID_TO_TYPE_MAP = Object.entries(
@@ -109,6 +117,7 @@ export const CHAIN_ID_TO_RPC_URL_MAP = {
   [KOVAN_CHAIN_ID]: KOVAN_RPC_URL,
   [GOERLI_CHAIN_ID]: GOERLI_RPC_URL,
   [MAINNET_CHAIN_ID]: MAINNET_RPC_URL,
+  [LOCALHOST_CHAIN_ID]: LOCALHOST_RPC_URL,
 };
 
 export const CHAIN_ID_TO_NETWORK_ID_MAP = Object.values(
@@ -152,3 +161,13 @@ export const CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP = {
   [OPTIMISM_CHAIN_ID]: 1,
   [OPTIMISM_TESTNET_CHAIN_ID]: 1,
 };
+
+/**
+ * Ethereum JSON-RPC methods that are known to exist but that we intentionally
+ * do not support.
+ */
+export const UNSUPPORTED_RPC_METHODS = new Set([
+  // This is implemented later in our middleware stack – specifically, in
+  // eth-json-rpc-middleware – but our UI does not support it.
+  'eth_signTransaction',
+]);
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index e8c979fd1..9adeaea9b 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -160,6 +160,10 @@
       "toNickname": ""
     },
     "useTokenDetection": true,
+    "advancedGasFee": {
+      "maxBaseFee": "1.5",
+      "priorityFee": "2"
+    },
     "tokenList": {
       "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": {
         "address": "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js
index 078cb124f..687b64f96 100644
--- a/test/e2e/tests/custom-rpc-history.spec.js
+++ b/test/e2e/tests/custom-rpc-history.spec.js
@@ -30,9 +30,9 @@ describe('Stores custom RPC history', function () {
 
         await driver.clickElement('.network-display');
 
-        await driver.clickElement({ text: 'Custom RPC', tag: 'span' });
+        await driver.clickElement({ text: 'Add Network', tag: 'button' });
 
-        await driver.findElement('.settings-page__sub-header-text');
+        await driver.findElement('.networks-tab__sub-header-text');
 
         const customRpcInputs = await driver.findElements('input[type="text"]');
         const networkNameInput = customRpcInputs[0];
@@ -48,7 +48,10 @@ describe('Stores custom RPC history', function () {
         await chainIdInput.clear();
         await chainIdInput.sendKeys(chainId.toString());
 
-        await driver.clickElement('.network-form__footer .btn-primary');
+        await driver.clickElement(
+          '.networks-tab__add-network-form-footer .btn-primary',
+        );
+
         await driver.findElement({ text: networkName, tag: 'span' });
       },
     );
@@ -71,9 +74,9 @@ describe('Stores custom RPC history', function () {
 
         await driver.clickElement('.network-display');
 
-        await driver.clickElement({ text: 'Custom RPC', tag: 'span' });
+        await driver.clickElement({ text: 'Add Network', tag: 'button' });
 
-        await driver.findElement('.settings-page__sub-header-text');
+        await driver.findElement('.networks-tab__sub-header-text');
 
         const customRpcInputs = await driver.findElements('input[type="text"]');
         const rpcUrlInput = customRpcInputs[1];
@@ -81,8 +84,8 @@ describe('Stores custom RPC history', function () {
         await rpcUrlInput.clear();
         await rpcUrlInput.sendKeys(duplicateRpcUrl);
         await driver.findElement({
-          text: 'This URL is currently used by the Localhost 8545 network.',
-          tag: 'p',
+          text: 'This URL is currently used by the localhost network.',
+          tag: 'h6',
         });
       },
     );
@@ -106,9 +109,9 @@ describe('Stores custom RPC history', function () {
 
         await driver.clickElement('.network-display');
 
-        await driver.clickElement({ text: 'Custom RPC', tag: 'span' });
+        await driver.clickElement({ text: 'Add Network', tag: 'button' });
 
-        await driver.findElement('.settings-page__sub-header-text');
+        await driver.findElement('.networks-tab__sub-header-text');
 
         const customRpcInputs = await driver.findElements('input[type="text"]');
         const rpcUrlInput = customRpcInputs[1];
@@ -120,9 +123,8 @@ describe('Stores custom RPC history', function () {
         await chainIdInput.clear();
         await chainIdInput.sendKeys(duplicateChainId);
         await driver.findElement({
-          text:
-            'This Chain ID is currently used by the Localhost 8545 network.',
-          tag: 'p',
+          text: 'This Chain ID is currently used by the localhost network.',
+          tag: 'h6',
         });
       },
     );
@@ -189,10 +191,13 @@ describe('Stores custom RPC history', function () {
 
         await driver.clickElement('.network-display');
 
-        await driver.clickElement({ text: 'Custom RPC', tag: 'span' });
+        await driver.clickElement({ text: 'Add Network', tag: 'button' });
 
-        // cancel new custom rpc
-        await driver.clickElement('.network-form__footer button.btn-secondary');
+        await driver.findVisibleElement('.settings-page__content');
+        // // cancel new custom rpc
+        await driver.clickElement(
+          '.networks-tab__add-network-form-footer button.btn-secondary',
+        );
 
         const networkListItems = await driver.findClickableElements(
           '.networks-tab__networks-list-name',
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index 0bd3b683a..a83a9bbbb 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -27,38 +27,72 @@ describe('Metamask Import UI', function () {
       async ({ driver }) => {
         await driver.navigate();
 
-        // clicks the continue button on the welcome screen
-        await driver.findElement('.welcome-page__header');
-        await driver.clickElement({
-          text: enLocaleMessages.getStarted.message,
-          tag: 'button',
-        });
+        if (process.env.ONBOARDING_V2 === '1') {
+          // welcome
+          await driver.clickElement('[data-testid="onboarding-import-wallet"]');
 
-        // clicks the "Import Wallet" option
-        await driver.clickElement({ text: 'Import wallet', tag: 'button' });
+          // metrics
+          await driver.clickElement('[data-testid="metametrics-no-thanks"]');
 
-        // clicks the "No thanks" option on the metametrics opt-in screen
-        await driver.clickElement('.btn-secondary');
+          // import with recovery phrase
+          await driver.fill('[data-testid="import-srp-text"]', testSeedPhrase);
+          await driver.clickElement('[data-testid="import-srp-confirm"]');
 
-        // Import Secret Recovery Phrase
-        await driver.fill(
-          'input[placeholder="Paste Secret Recovery Phrase from clipboard"]',
-          testSeedPhrase,
-        );
+          // create password
+          await driver.fill(
+            '[data-testid="create-password-new"]',
+            'correct horse battery staple',
+          );
+          await driver.fill(
+            '[data-testid="create-password-confirm"]',
+            'correct horse battery staple',
+          );
+          await driver.clickElement('[data-testid="create-password-terms"]');
+          await driver.clickElement('[data-testid="create-password-import"]');
+
+          // complete
+          await driver.clickElement('[data-testid="onboarding-complete-done"]');
+
+          // pin extension
+          await driver.clickElement('[data-testid="pin-extension-next"]');
+          await driver.clickElement('[data-testid="pin-extension-done"]');
+        } else {
+          // clicks the continue button on the welcome screen
+          await driver.findElement('.welcome-page__header');
+          await driver.clickElement({
+            text: enLocaleMessages.getStarted.message,
+            tag: 'button',
+          });
+
+          // clicks the "Import Wallet" option
+          await driver.clickElement({ text: 'Import wallet', tag: 'button' });
+
+          // clicks the "No thanks" option on the metametrics opt-in screen
+          await driver.clickElement('.btn-secondary');
+
+          // Import Secret Recovery Phrase
+          await driver.fill(
+            'input[placeholder="Paste Secret Recovery Phrase from clipboard"]',
+            testSeedPhrase,
+          );
 
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.fill('#confirm-password', 'correct horse battery staple');
+          await driver.fill('#password', 'correct horse battery staple');
+          await driver.fill(
+            '#confirm-password',
+            'correct horse battery staple',
+          );
 
-        await driver.clickElement('.first-time-flow__terms');
+          await driver.clickElement('.first-time-flow__terms');
 
-        await driver.clickElement({ text: 'Import', tag: 'button' });
+          await driver.clickElement({ text: 'Import', tag: 'button' });
 
-        // clicks through the success screen
-        await driver.findElement({ text: 'Congratulations', tag: 'div' });
-        await driver.clickElement({
-          text: enLocaleMessages.endOfFlowMessage10.message,
-          tag: 'button',
-        });
+          // clicks through the success screen
+          await driver.findElement({ text: 'Congratulations', tag: 'div' });
+          await driver.clickElement({
+            text: enLocaleMessages.endOfFlowMessage10.message,
+            tag: 'button',
+          });
+        }
 
         // Show account information
         await driver.clickElement(
@@ -233,10 +267,15 @@ describe('Metamask Import UI', function () {
         // should remove the account
         await driver.clickElement({ text: 'Remove', tag: 'button' });
 
-        const currentActiveAccountName = await driver.findElement(
-          '.selected-account__name',
+        // Wait until selected account switches away from removed account to first account
+        await driver.waitForSelector(
+          {
+            css: '.selected-account__name',
+            text: 'Account 1',
+          },
+          { timeout: 10000 },
         );
-        assert.equal(await currentActiveAccountName.getText(), 'Account 1');
+
         await driver.delay(regularDelayMs);
         await driver.clickElement('.account-menu__icon');
 
diff --git a/test/e2e/tests/lockdown.spec.js b/test/e2e/tests/lockdown.spec.js
new file mode 100644
index 000000000..a1d0db969
--- /dev/null
+++ b/test/e2e/tests/lockdown.spec.js
@@ -0,0 +1,89 @@
+const { strict: assert } = require('assert');
+const { Browser } = require('selenium-webdriver');
+const {
+  getGlobalProperties,
+  testIntrinsic,
+} = require('../../helpers/protect-intrinsics-helpers');
+const { withFixtures } = require('../helpers');
+const { PAGES } = require('../webdriver/driver');
+
+const isFirefox = process.env.SELENIUM_BROWSER === Browser.FIREFOX;
+
+/**
+ * This script iterates over all named intrinsics and tests that they are locked
+ * down per ses/lockdown.
+ *
+ * We set globalThis to window in Firefox because the test fails otherwise.
+ * We believe this is due to some Selenium-related shenanigans. In the browser,
+ * this behavior is not a problem.
+ */
+const lockdownTestScript = `
+${isFirefox ? 'globalThis = window;' : ''}
+
+const assert = {
+  equal: (value, comparison, message) => {
+    if (value !== comparison) {
+      throw new Error(message || 'not equal');
+    }
+  },
+  ok: (value, message) => {
+    if (!value) {
+      throw new Error(message || 'not ok');
+    }
+  },
+};
+
+${getGlobalProperties.toString()}
+
+${testIntrinsic.toString()}
+
+try {
+  getGlobalProperties().forEach((propertyName) => {
+    console.log('Testing intrinsic:', propertyName);
+    testIntrinsic(propertyName);
+  })
+  console.log('Lockdown test successful!');
+  return true;
+} catch (error) {
+  console.log('Lockdown test failed.', error);
+  return false;
+}
+`;
+
+describe('lockdown', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: 25000000000000000000,
+      },
+    ],
+  };
+
+  it('the UI and background environments are locked down', async function () {
+    await withFixtures(
+      {
+        // The fixtures used here is arbitrary. Any fixture would do.
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate(PAGES.HOME);
+        assert.equal(
+          await driver.executeScript(lockdownTestScript),
+          true,
+          'The UI environment should be locked down.',
+        );
+
+        await driver.navigate(PAGES.BACKGROUND);
+        assert.equal(
+          await driver.executeScript(lockdownTestScript),
+          true,
+          'The background environment should be locked down.',
+        );
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js
index e512ce9f4..adb5ad644 100644
--- a/test/e2e/tests/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/metamask-responsive-ui.spec.js
@@ -16,77 +16,133 @@ describe('Metamask Responsive UI', function () {
       async ({ driver }) => {
         await driver.navigate();
 
-        // clicks the continue button on the welcome screen
-        await driver.findElement('.welcome-page__header');
-        await driver.clickElement({
-          text: enLocaleMessages.getStarted.message,
-          tag: 'button',
-        });
-        await driver.delay(tinyDelayMs);
+        async function clickWordAndWait(word) {
+          await driver.clickElement(
+            `[data-testid="seed-phrase-sorted"] [data-testid="draggable-seed-${word}"]`,
+          );
+          await driver.delay(tinyDelayMs);
+        }
 
-        // clicks the "Create New Wallet" option
-        await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
+        if (process.env.ONBOARDING_V2 === '1') {
+          // welcome
+          await driver.clickElement('[data-testid="onboarding-create-wallet"]');
 
-        // clicks the "I Agree" option on the metametrics opt-in screen
-        await driver.clickElement('.btn-primary');
+          // metrics
+          await driver.clickElement('[data-testid="metametrics-no-thanks"]');
 
-        // accepts a secure password
-        await driver.fill(
-          '.first-time-flow__form #create-password',
-          'correct horse battery staple',
-        );
-        await driver.fill(
-          '.first-time-flow__form #confirm-password',
-          'correct horse battery staple',
-        );
-        await driver.clickElement('.first-time-flow__checkbox');
-        await driver.clickElement('.first-time-flow__form button');
+          // create password
+          await driver.fill(
+            '[data-testid="create-password-new"]',
+            'correct horse battery staple',
+          );
+          await driver.fill(
+            '[data-testid="create-password-confirm"]',
+            'correct horse battery staple',
+          );
+          await driver.clickElement('[data-testid="create-password-terms"]');
+          await driver.clickElement('[data-testid="create-password-wallet"]');
 
-        // renders the Secret Recovery Phrase intro screen
-        await driver.clickElement('.seed-phrase-intro__left button');
+          // secure wallet
+          await driver.clickElement(
+            '[data-testid="secure-wallet-recommended"]',
+          );
 
-        // reveals the Secret Recovery Phrase
-        await driver.clickElement(
-          '.reveal-seed-phrase__secret-blocker .reveal-seed-phrase__reveal-button',
-        );
-        const revealedSeedPhrase = await driver.findElement(
-          '.reveal-seed-phrase__secret-words',
-        );
-        const seedPhrase = await revealedSeedPhrase.getText();
-        assert.equal(seedPhrase.split(' ').length, 12);
+          // review
+          await driver.clickElement('[data-testid="recovery-phrase-reveal"]');
+          const chipTwo = await (
+            await driver.findElement('[data-testid="recovery-phrase-chip-2"]')
+          ).getText();
+          const chipThree = await (
+            await driver.findElement('[data-testid="recovery-phrase-chip-3"]')
+          ).getText();
+          const chipSeven = await (
+            await driver.findElement('[data-testid="recovery-phrase-chip-7"]')
+          ).getText();
+          await driver.clickElement('[data-testid="recovery-phrase-next"]');
+
+          // confirm
+          await driver.fill('[data-testid="recovery-phrase-input-2"]', chipTwo);
+          await driver.fill(
+            '[data-testid="recovery-phrase-input-3"]',
+            chipThree,
+          );
+          await driver.fill(
+            '[data-testid="recovery-phrase-input-7"]',
+            chipSeven,
+          );
+          await driver.clickElement('[data-testid="recovery-phrase-confirm"]');
+
+          // complete
+          await driver.clickElement('[data-testid="onboarding-complete-done"]');
+
+          // pin extension
+          await driver.clickElement('[data-testid="pin-extension-next"]');
+          await driver.clickElement('[data-testid="pin-extension-done"]');
+        } else {
+          // clicks the continue button on the welcome screen
+          await driver.findElement('.welcome-page__header');
+          await driver.clickElement({
+            text: enLocaleMessages.getStarted.message,
+            tag: 'button',
+          });
+          await driver.delay(tinyDelayMs);
 
-        await driver.clickElement({
-          text: enLocaleMessages.next.message,
-          tag: 'button',
-        });
+          // clicks the "Create New Wallet" option
+          await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
 
-        async function clickWordAndWait(word) {
-          await driver.clickElement(
-            `[data-testid="seed-phrase-sorted"] [data-testid="draggable-seed-${word}"]`,
+          // clicks the "I Agree" option on the metametrics opt-in screen
+          await driver.clickElement('.btn-primary');
+
+          // accepts a secure password
+          await driver.fill(
+            '.first-time-flow__form #create-password',
+            'correct horse battery staple',
           );
-          await driver.delay(tinyDelayMs);
-        }
+          await driver.fill(
+            '.first-time-flow__form #confirm-password',
+            'correct horse battery staple',
+          );
+          await driver.clickElement('.first-time-flow__checkbox');
+          await driver.clickElement('.first-time-flow__form button');
 
-        // can retype the Secret Recovery Phrase
-        const words = seedPhrase.split(' ');
-        for (const word of words) {
-          await clickWordAndWait(word);
-        }
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          // renders the Secret Recovery Phrase intro screen
+          await driver.clickElement('.seed-phrase-intro__left button');
 
-        // clicks through the success screen
-        await driver.findElement({ text: 'Congratulations', tag: 'div' });
-        await driver.clickElement({
-          text: enLocaleMessages.endOfFlowMessage10.message,
-          tag: 'button',
-        });
+          // reveals the Secret Recovery Phrase
+          await driver.clickElement(
+            '.reveal-seed-phrase__secret-blocker .reveal-seed-phrase__reveal-button',
+          );
+          const revealedSeedPhrase = await driver.findElement(
+            '.reveal-seed-phrase__secret-words',
+          );
+          const seedPhrase = await revealedSeedPhrase.getText();
+          assert.equal(seedPhrase.split(' ').length, 12);
+
+          await driver.clickElement({
+            text: enLocaleMessages.next.message,
+            tag: 'button',
+          });
+
+          // can retype the Secret Recovery Phrase
+          const words = seedPhrase.split(' ');
+          for (const word of words) {
+            await clickWordAndWait(word);
+          }
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // clicks through the success screen
+          await driver.findElement({ text: 'Congratulations', tag: 'div' });
+          await driver.clickElement({
+            text: enLocaleMessages.endOfFlowMessage10.message,
+            tag: 'button',
+          });
+        }
 
-        // Show account information
-        // balance renders
-        await driver.waitForSelector({
-          css: '[data-testid="eth-overview__primary-currency"]',
-          text: '0 ETH',
-        });
+        // assert balance
+        const balance = await driver.findElement(
+          '[data-testid="wallet-balance"]',
+        );
+        assert.ok(/^0\sETH$/u.test(await balance.getText()));
       },
     );
   });
diff --git a/test/e2e/tests/provider-api.spec.js b/test/e2e/tests/provider-api.spec.js
new file mode 100644
index 000000000..c2c5928f7
--- /dev/null
+++ b/test/e2e/tests/provider-api.spec.js
@@ -0,0 +1,111 @@
+const { strict: assert } = require('assert');
+const { errorCodes } = require('eth-rpc-errors');
+const { withFixtures } = require('../helpers');
+
+describe('MetaMask', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: 25000000000000000000,
+      },
+    ],
+  };
+
+  it('provider should inform dapp when switching networks', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: 'connected-state',
+        ganacheOptions,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        await driver.openNewPage('http://127.0.0.1:8080/');
+        const networkDiv = await driver.waitForSelector({
+          css: '#network',
+          text: '1337',
+        });
+        const chainIdDiv = await driver.waitForSelector({
+          css: '#chainId',
+          text: '0x539',
+        });
+        assert.equal(await networkDiv.getText(), '1337');
+        assert.equal(await chainIdDiv.getText(), '0x539');
+
+        const windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindow(windowHandles[0]);
+
+        await driver.clickElement('.network-display');
+        await driver.clickElement({ text: 'Ethereum Mainnet', tag: 'span' });
+
+        await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
+        const switchedNetworkDiv = await driver.waitForSelector({
+          css: '#network',
+          text: '1',
+        });
+        const switchedChainIdDiv = await driver.waitForSelector({
+          css: '#chainId',
+          text: '0x1',
+        });
+        const accountsDiv = await driver.findElement('#accounts');
+
+        assert.equal(await switchedNetworkDiv.getText(), '1');
+        assert.equal(await switchedChainIdDiv.getText(), '0x1');
+        assert.equal(
+          await accountsDiv.getText(),
+          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
+        );
+      },
+    );
+  });
+
+  it('should reject unsupported methods', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        failOnConsoleError: false,
+        fixtures: 'connected-state',
+        ganacheOptions,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        await driver.openNewPage('http://127.0.0.1:8080/');
+        for (const unsupportedMethod of ['eth_signTransaction']) {
+          assert.equal(
+            await driver.executeAsyncScript(`
+              const webDriverCallback = arguments[arguments.length - 1];
+              window.ethereum.request({ method: '${unsupportedMethod}' })
+                .then(() => {
+                  console.error('The unsupported method "${unsupportedMethod}" was not rejected.');
+                  webDriverCallback(false);
+                })
+                .catch((error) => {
+                  if (error.code === ${errorCodes.rpc.methodNotSupported}) {
+                    webDriverCallback(true);
+                  }
+
+                  console.error(
+                    'The unsupported method "${unsupportedMethod}" was rejected with an unexpected error.',
+                    error,
+                  );
+                  webDriverCallback(false);
+                })
+            `),
+            true,
+            `The unsupported method "${unsupportedMethod}" should be rejected by the provider.`,
+          );
+        }
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/provider-events.spec.js b/test/e2e/tests/provider-events.spec.js
deleted file mode 100644
index effe3e717..000000000
--- a/test/e2e/tests/provider-events.spec.js
+++ /dev/null
@@ -1,65 +0,0 @@
-const { strict: assert } = require('assert');
-const { withFixtures } = require('../helpers');
-
-describe('MetaMask', function () {
-  it('provider should inform dapp when switching networks', async function () {
-    const ganacheOptions = {
-      accounts: [
-        {
-          secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-          balance: 25000000000000000000,
-        },
-      ],
-    };
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: 'connected-state',
-        ganacheOptions,
-        title: this.test.title,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        await driver.openNewPage('http://127.0.0.1:8080/');
-        const networkDiv = await driver.waitForSelector({
-          css: '#network',
-          text: '1337',
-        });
-        const chainIdDiv = await driver.waitForSelector({
-          css: '#chainId',
-          text: '0x539',
-        });
-        assert.equal(await networkDiv.getText(), '1337');
-        assert.equal(await chainIdDiv.getText(), '0x539');
-
-        const windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindow(windowHandles[0]);
-
-        await driver.clickElement('.network-display');
-        await driver.clickElement({ text: 'Ropsten', tag: 'span' });
-
-        await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
-        const switchedNetworkDiv = await driver.waitForSelector({
-          css: '#network',
-          text: '3',
-        });
-        const switchedChainIdDiv = await driver.waitForSelector({
-          css: '#chainId',
-          text: '0x3',
-        });
-        const accountsDiv = await driver.findElement('#accounts');
-
-        assert.equal(await switchedNetworkDiv.getText(), '3');
-        assert.equal(await switchedChainIdDiv.getText(), '0x3');
-        assert.equal(
-          await accountsDiv.getText(),
-          '0x5cfe73b6021e818b776b421b1c4db2474086a7e1',
-        );
-      },
-    );
-  });
-});
diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
index ad8430794..56065ea7f 100644
--- a/test/e2e/webdriver/driver.js
+++ b/test/e2e/webdriver/driver.js
@@ -29,6 +29,10 @@ function wrapElementWithAPI(element, driver) {
   return element;
 }
 
+/**
+ * For Selenium WebDriver API documentation, see:
+ * https://www.selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/index_exports_WebDriver.html
+ */
 class Driver {
   /**
    * @param {!ThenableWebDriver} driver - A {@code WebDriver} instance
@@ -49,6 +53,14 @@ class Driver {
     };
   }
 
+  async executeAsyncScript(script, ...args) {
+    return this.driver.executeAsyncScript(script, args);
+  }
+
+  async executeScript(script, ...args) {
+    return this.driver.executeScript(script, args);
+  }
+
   buildLocator(locator) {
     if (typeof locator === 'string') {
       // If locator is a string we assume its a css selector
@@ -388,6 +400,7 @@ function collectMetrics() {
 }
 
 Driver.PAGES = {
+  BACKGROUND: 'background',
   HOME: 'home',
   NOTIFICATION: 'notification',
   POPUP: 'popup',
diff --git a/test/helpers/protect-intrinsics-helpers.js b/test/helpers/protect-intrinsics-helpers.js
new file mode 100644
index 000000000..d3e046e08
--- /dev/null
+++ b/test/helpers/protect-intrinsics-helpers.js
@@ -0,0 +1,81 @@
+const { strict: assert } = require('assert');
+
+module.exports = {
+  getGlobalProperties,
+  testIntrinsic,
+};
+
+/**
+ * Gets the global intrinsic property names in a locked down environemnt.
+ *
+ * @returns {Set<string>} All global intrinsic property names.
+ */
+function getGlobalProperties() {
+  // These are Agoric inventions, and we don't care about them.
+  const ignoreList = new Set([
+    'Compartment',
+    'HandledPromise',
+    'StaticModuleRecord',
+  ]);
+
+  const namedIntrinsics = Reflect.ownKeys(new Compartment().globalThis);
+
+  return new Set(
+    [
+      // Added to global scope by ses/dist/lockdown.cjs.
+      ...namedIntrinsics,
+
+      // TODO: Also include the named platform globals
+      // This grabs every enumerable property on globalThis.
+      // ...Object.keys(globalThis),
+    ].filter((propertyName) => !ignoreList.has(propertyName)),
+  );
+}
+
+/**
+ * Performs a number of assertions on the specified intrinsic property to
+ * ensure that the environment is locked down properly.
+ * Throws if any assertion fails.
+ *
+ * @param {string} propertyName - The name of the intrinsic property to test.
+ */
+function testIntrinsic(propertyName) {
+  const descriptor = Reflect.getOwnPropertyDescriptor(globalThis, propertyName);
+
+  assert.ok(
+    descriptor,
+    `globalThis["${propertyName}"] should have a descriptor`,
+  );
+
+  // As long as Object.isFrozen is the true Object.isFrozen, the object
+  // it is called with cannot lie about being frozen.
+  const value = globalThis[propertyName];
+  if (value !== globalThis) {
+    assert.equal(
+      Object.isFrozen(value),
+      true,
+      `value of universal property globalThis["${propertyName}"] should be frozen`,
+    );
+  }
+
+  // The writability of properties with accessors cannot be modified.
+  if ('set' in descriptor || 'get' in descriptor) {
+    assert.equal(
+      descriptor.configurable,
+      false,
+      `globalThis["${propertyName}"] should be non-configurable`,
+    );
+  } else {
+    assert.equal(
+      descriptor.configurable,
+      false,
+      `globalThis["${propertyName}"] should be non-configurable`,
+    );
+
+    assert.equal(
+      descriptor.writable,
+      false,
+      `globalThis["${propertyName}"] should be non-writable`,
+    );
+  }
+}
diff --git a/test/stub/provider.js b/test/stub/provider.js
index 7f84e795f..da618f4c7 100644
--- a/test/stub/provider.js
+++ b/test/stub/provider.js
@@ -1,6 +1,5 @@
-import { JsonRpcEngine } from 'json-rpc-engine';
-import scaffoldMiddleware from 'eth-json-rpc-middleware/scaffold';
-import providerAsMiddleware from 'eth-json-rpc-middleware/providerAsMiddleware';
+import { JsonRpcEngine, createScaffoldMiddleware } from 'json-rpc-engine';
+import { providerAsMiddleware } from 'eth-json-rpc-middleware';
 import GanacheCore from 'ganache-core';
 
 export function getTestSeed() {
@@ -45,7 +44,7 @@ export function providerFromEngine(engine) {
 export function createTestProviderTools(opts = {}) {
   const engine = createEngineForTestData();
   // handle provided hooks
-  engine.push(scaffoldMiddleware(opts.scaffold || {}));
+  engine.push(createScaffoldMiddleware(opts.scaffold || {}));
   // handle block tracker methods
   engine.push(
     providerAsMiddleware(
diff --git a/test/unit-global/protect-intrinsics.test.js b/test/unit-global/protect-intrinsics.test.js
index 3958d7762..c3cd02a29 100644
--- a/test/unit-global/protect-intrinsics.test.js
+++ b/test/unit-global/protect-intrinsics.test.js
@@ -1,72 +1,15 @@
 import 'ses/lockdown';
 import '../../app/scripts/lockdown-run';
 import '../../app/scripts/lockdown-more';
-import { strict as assert } from 'assert';
-
-// These are Agoric inventions, and we don't care about them.
-const ignoreList = new Set([
-  'Compartment',
-  'HandledPromise',
-  'StaticModuleRecord',
-]);
+import {
+  getGlobalProperties,
+  testIntrinsic,
+} from '../helpers/protect-intrinsics-helpers';
 
 describe('non-modifiable intrinsics', function () {
-  const namedIntrinsics = Reflect.ownKeys(new Compartment().globalThis);
-
-  const globalProperties = new Set(
-    [
-      // Added to global scope by ses/dist/lockdown.cjs.
-      ...namedIntrinsics,
-
-      // TODO: Also include the named platform globals
-      // This grabs every enumerable property on globalThis.
-      // ...Object.keys(globalThis),
-    ].filter((propertyName) => !ignoreList.has(propertyName)),
-  );
-
-  globalProperties.forEach((propertyName) => {
+  getGlobalProperties().forEach((propertyName) => {
     it(`intrinsic globalThis["${propertyName}"]`, function () {
-      const descriptor = Reflect.getOwnPropertyDescriptor(
-        globalThis,
-        propertyName,
-      );
-
-      assert.ok(
-        descriptor,
-        `globalThis["${propertyName}"] should have a descriptor`,
-      );
-
-      // As long as Object.isFrozen is the true Object.isFrozen, the object
-      // it is called with cannot lie about being frozen.
-      const value = globalThis[propertyName];
-      if (value !== globalThis) {
-        assert.equal(
-          Object.isFrozen(value),
-          true,
-          `value of universal property globalThis["${propertyName}"] should be frozen`,
-        );
-      }
-
-      // The writability of properties with accessors cannot be modified.
-      if ('set' in descriptor || 'get' in descriptor) {
-        assert.equal(
-          descriptor.configurable,
-          false,
-          `globalThis["${propertyName}"] should be non-configurable`,
-        );
-      } else {
-        assert.equal(
-          descriptor.configurable,
-          false,
-          `globalThis["${propertyName}"] should be non-configurable`,
-        );
-
-        assert.equal(
-          descriptor.writable,
-          false,
-          `globalThis["${propertyName}"] should be non-writable`,
-        );
-      }
+      testIntrinsic(propertyName);
     });
   });
 });
diff --git a/ui/1.INTRODUCTION.stories.mdx b/ui/1.INTRODUCTION.stories.mdx
new file mode 100644
index 000000000..23ba7e8f7
--- /dev/null
+++ b/ui/1.INTRODUCTION.stories.mdx
@@ -0,0 +1,15 @@
+import { Meta } from '@storybook/addon-docs';
+
+<Meta title="Getting Started / Introduction" />
+
+# Introduction
+
+Welcome to the MetaMask Browser Extension Storybook.
+
+## Building locally and Contributing
+
+This document is currently only specific to storybook best practices and component documentation guidelines. This may change in future but for now if you are looking to get a local build of Metamask up and running or contribute to the extension codebase please read the Metamask [README.md](https://github.com/MetaMask/metamask-extension)
+
+## Documentation Guidelines
+
+If you're here to improve our storybook documentation you're in the right place! Please head over to the [Documentation Guidelines](./?path=/story/getting-started-documentation-guidelines--page) for contributing to component documentation in storybook.
diff --git a/ui/2.DOCUMENTATION.stories.mdx b/ui/2.DOCUMENTATION.stories.mdx
new file mode 100644
index 000000000..056edb647
--- /dev/null
+++ b/ui/2.DOCUMENTATION.stories.mdx
@@ -0,0 +1,182 @@
+import { Meta } from '@storybook/addon-docs';
+
+<Meta title="Getting Started / Documentation Guidelines" />
+
+# Documentation Guidelines
+
+> 💡 To improve the quality of our component documentation we are currently in the process of updating our storybook to use Storyboook's [controls](https://storybook.js.org/addons/@storybook/addon-controls/), [a11y](https://storybook.js.org/addons/@storybook/addon-a11y/) and [docs](https://storybook.js.org/addons/@storybook/addon-docs/) plugins. You will find most components currently without documentation and use knobs for their primary interactivity. These will eventually be updated.
+
+## General Guidelines
+
+Thorough documentation makes it much easier for a component to be found, adapted and reused. It also provides space for explanation and reasoning for a component. This is useful as components become more complex.
+
+Some general documentation best practices to follow:
+
+- Put yourself in the shoes of another developer trying to use the component you just created for the first time
+- Write a brief description of the component and what it's used for in the `README.mdx` file
+- Display the component's api using the `<ArgsTable of={YourComponent} />` component from storybook docs
+- Use the [controls](https://storybook.js.org/addons/@storybook/addon-controls/) api over knobs
+- Use the updated `argType` [actions](https://storybook.js.org/docs/react/essentials/actions) api over importing the actions plugin directly
+- Check the accessibility of the component using the **Accessibility** tab
+
+See the [Button](https://metamask.github.io/metamask-storybook/index.html?path=/story/ui-components-ui-button-button-stories-js--default-story)(`ui/components/ui/button/button.stories.js`) component for reference
+
+## Creating a Story
+
+[Component Story Format (CSF)](https://storybook.js.org/docs/react/api/csf) is the recommended way to write stories. It's an open standard based on ES6 modules. The below example is of the Button component and it explains how we should write our stories.
+
+```jsx
+// Button component example story
+
+import React from 'react';
+
+import BuyIcon from '../icon/overview-buy-icon.component';
+
+// The mdx file to document component api and usage
+import README from './README.mdx';
+import Button from '.';
+
+// The default storybook component export should always follow the same template
+export default {
+  title: 'Button', // The `title` effects the components tile and location in storybook
+  id: __filename, // The file name id is used to track what storybook files have changed in CI
+  component: Button, // The component you are documenting
+  parameters: {
+    docs: {
+      page: README, // Reference to the mdx file docs page
+    },
+  },
+  // the controls plugin argTypes are used for the interactivity of the component
+  argTypes: {
+    children: { control: 'text' },
+    disabled: { control: 'boolean' },
+    // use the updated action api to log actions in the actions tab
+    onClick: { action: 'clicked' },
+    type: {
+      control: {
+        type: 'select',
+      },
+      options: [
+        'default',
+        'primary',
+        'secondary',
+        'warning',
+        'danger',
+        'danger-primary',
+        'link',
+      ],
+    },
+    submit: { control: 'boolean' },
+    large: { control: 'boolean' },
+    className: { control: 'text' },
+    icon: {
+      control: {
+        type: 'select',
+      },
+      options: ['BuyIcon'],
+      mapping: {
+        BuyIcon: <BuyIcon />,
+      },
+    },
+  },
+};
+
+// First story component should always be called "DefaultStory"
+// The `DefaultStory` should include argTypes and controls where appropriate
+export const DefaultStory = (args) => (
+  <Button {...args}>{args.children}</Button>
+);
+
+// The name of the DefaultStory component can be renamed to simply "Default"
+DefaultStory.storyName = 'Default';
+
+// More stories should be added for different usage examples
+// You can add as many stories as you think appropriate to comprehensively document the component
+export const Types = (args) => (
+  <>
+    <Button {...args} type="default">
+      {args.children || 'Default'}
+    </Button>
+    <Button {...args} type="primary">
+      {args.children || 'Primary'}
+    </Button>
+    <Button {...args} type="secondary">
+      {args.children || 'Secondary'}
+    </Button>
+    <Button {...args} type="warning">
+      {args.children || 'Warning'}
+    </Button>
+    <Button {...args} type="danger">
+      {args.children || 'Danger'}
+    </Button>
+    <Button {...args} type="danger-primary">
+      {args.children || 'Danger primary'}
+    </Button>
+    <Button {...args} type="link">
+      {args.children || 'Link'}
+    </Button>
+  </>
+);
+```
+
+## Writing MDX Documentation
+
+Now the storybook components are complete, the `README.mdx` documentation should explain the component in detail. [MDX](https://mdxjs.com/) format lets you seamlessly use `JSX` in your markdown documents. You can import react components and stories into your documentation to enhance the developer experience.
+
+```md
+<!-- import the necessary blocks from storybook docs  -->
+
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+<!-- import the component to use for the ArgsTable under ## Component API  -->
+
+import Button from '.';
+
+<!-- Title of the component  -->
+
+# Button
+
+<!-- Brief description of the component  -->
+
+Buttons communicate actions that users can take.
+
+<!-- Embed the DefaultStory using the storybook url  -->
+
+<Canvas>
+  <Story id="ui-components-ui-button-button-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<!-- Display the component api using the ArgsTable  -->
+
+<ArgsTable of={Button} />
+
+## Usage
+
+<!-- Further documentation on usage of the component  -->
+
+The following describes the props and example usage for this component.
+
+### Type
+
+By changing the `type` prop you can use different styles of the button.
+
+| type              | Description                                                                                           |
+| ----------------- | ----------------------------------------------------------------------------------------------------- |
+| `default`         | default style of the button                                                                           |
+| `primary`         | the principle call to action on the page                                                              |
+| `secondary`       | secondary actions on each page                                                                        |
+| `warning`         | a warning action in the page                                                                          |
+| `danger`          | a negative action (such as Delete) on the page                                                        |
+| `danger--primary` | a negative principle call to action (such as Delete) on the page                                      |
+| `link`            | an optional action or navigation action out of the app changes root html tag from `<button>` to `<a>` |
+
+<!-- Embed other stories to further illustrate component usage  -->
+
+<Canvas>
+  <Story id="ui-components-ui-button-button-stories-js--types" />
+</Canvas>
+```
+
+Nice work! You're now ready to start creating comprehensive documentation using storybook 🎉👍
diff --git a/ui/components/app/account-menu/account-menu.component.js b/ui/components/app/account-menu/account-menu.component.js
index 19188fbc2..f72077777 100644
--- a/ui/components/app/account-menu/account-menu.component.js
+++ b/ui/components/app/account-menu/account-menu.component.js
@@ -238,6 +238,7 @@ export default class AccountMenu extends Component {
     switch (type) {
       case KEYRING_TYPES.TREZOR:
       case KEYRING_TYPES.LEDGER:
+      case KEYRING_TYPES.LATTICE:
         label = t('hardware');
         break;
       case 'Simple Key Pair':
diff --git a/ui/components/app/app-header/index.scss b/ui/components/app/app-header/index.scss
index ab706635e..78fb809e3 100644
--- a/ui/components/app/app-header/index.scss
+++ b/ui/components/app/app-header/index.scss
@@ -96,10 +96,6 @@
     flex: 1 0 auto;
     width: 0;
     justify-content: flex-end;
-
-    .beta & span {
-      color: $ui-3;
-    }
   }
 
   &__network-down-arrow {
@@ -108,8 +104,4 @@
     background-size: contain;
     background-position: center;
   }
-
-  .beta & {
-    background: $ui-black;
-  }
 }
diff --git a/ui/components/app/collectibles-list/collectibles-list.component.js b/ui/components/app/collectibles-list/collectibles-list.component.js
new file mode 100644
index 000000000..4fde98023
--- /dev/null
+++ b/ui/components/app/collectibles-list/collectibles-list.component.js
@@ -0,0 +1,81 @@
+import React 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,
+  FONT_WEIGHT,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export default function CollectiblesList({ onAddNFT }) {
+  const collectibles = [];
+  const t = useI18nContext();
+
+  return (
+    <div className="collectibles-list">
+      {collectibles.length > 0 ? (
+        <span>{JSON.stringify(collectibles)}</span>
+      ) : (
+        <Box padding={[4, 0, 4, 0]}>
+          <Box justifyContent={JUSTIFY_CONTENT.CENTER}>
+            <img src="./images/no-nfts.svg" />
+          </Box>
+          <Box
+            marginTop={4}
+            marginBottom={12}
+            justifyContent={JUSTIFY_CONTENT.CENTER}
+            flexDirection={FLEX_DIRECTION.COLUMN}
+          >
+            <Typography
+              color={COLORS.UI3}
+              variant={TYPOGRAPHY.H4}
+              align={TEXT_ALIGN.CENTER}
+              fontWeight={FONT_WEIGHT.BOLD}
+            >
+              {t('noNFTs')}
+            </Typography>
+            <Button
+              type="link"
+              target="_blank"
+              rel="noopener noreferrer"
+              href="https://metamask.zendesk.com/hc/en-us/articles/360058238591-NFT-tokens-in-MetaMask-wallet"
+              style={{ padding: 0, fontSize: '1rem' }}
+            >
+              {t('learnMore')}
+            </Button>
+          </Box>
+          <Box
+            marginBottom={4}
+            justifyContent={JUSTIFY_CONTENT.CENTER}
+            flexDirection={FLEX_DIRECTION.COLUMN}
+          >
+            <Typography
+              color={COLORS.UI3}
+              variant={TYPOGRAPHY.H5}
+              align={TEXT_ALIGN.CENTER}
+            >
+              {t('missingNFT')}
+            </Typography>
+            <Button
+              type="link"
+              onClick={onAddNFT}
+              style={{ padding: 0, fontSize: '1rem' }}
+            >
+              {t('addNFT')}
+            </Button>
+          </Box>
+        </Box>
+      )}
+    </div>
+  );
+}
+
+CollectiblesList.propTypes = {
+  onAddNFT: PropTypes.func.isRequired,
+};
diff --git a/ui/components/app/collectibles-list/index.js b/ui/components/app/collectibles-list/index.js
new file mode 100644
index 000000000..ab3fb9b56
--- /dev/null
+++ b/ui/components/app/collectibles-list/index.js
@@ -0,0 +1 @@
+export { default } from './collectibles-list.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 9ddf77de8..fc0a5f669 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
@@ -10,6 +10,14 @@ import ConfirmPageContainer, {
   ConfirmPageContainerNavigation,
 } from '.';
 
+jest.mock('../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+}));
+
 describe('Confirm Page Container Container Test', () => {
   let wrapper;
 
@@ -31,6 +39,8 @@ describe('Confirm Page Container Container Test', () => {
       selectedAddress: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
       addressBook: [],
       chainId: 'test',
+      identities: [],
+      featureFlags: {},
     },
   };
 
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 509e4ebee..574967420 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
@@ -35,6 +35,7 @@ export default class ConfirmPageContainerContent extends Component {
     disabled: PropTypes.bool,
     unapprovedTxCount: PropTypes.number,
     rejectNText: PropTypes.string,
+    hideTitle: PropTypes.boolean,
   };
 
   renderContent() {
@@ -89,6 +90,7 @@ export default class ConfirmPageContainerContent extends Component {
       rejectNText,
       origin,
       ethGasPriceWarning,
+      hideTitle,
     } = this.props;
 
     return (
@@ -110,6 +112,7 @@ export default class ConfirmPageContainerContent extends Component {
           identiconAddress={identiconAddress}
           nonce={nonce}
           origin={origin}
+          hideTitle={hideTitle}
         />
         {this.renderContent()}
         {(errorKey || errorMessage) && (
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 25ab144a0..1ae028115 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
@@ -1,3 +1,4 @@
+/* eslint-disable no-negated-condition */
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
@@ -14,6 +15,7 @@ const ConfirmPageContainerSummary = (props) => {
     identiconAddress,
     nonce,
     origin,
+    hideTitle,
   } = props;
 
   return (
@@ -37,9 +39,11 @@ const ConfirmPageContainerSummary = (props) => {
             address={identiconAddress}
           />
         )}
-        <div className="confirm-page-container-summary__title-text">
-          {titleComponent || title}
-        </div>
+        {!hideTitle ? (
+          <div className="confirm-page-container-summary__title-text">
+            {titleComponent || title}
+          </div>
+        ) : null}
       </div>
       {hideSubtitle || (
         <div className="confirm-page-container-summary__subtitle">
@@ -60,6 +64,7 @@ ConfirmPageContainerSummary.propTypes = {
   identiconAddress: PropTypes.string,
   nonce: PropTypes.string,
   origin: PropTypes.string.isRequired,
+  hideTitle: PropTypes.boolean,
 };
 
 export default ConfirmPageContainerSummary;
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 397fc7ff0..117318e3d 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
@@ -4,6 +4,9 @@ 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 Dialog from '../../ui/dialog';
 import {
   ConfirmPageContainerHeader,
@@ -124,97 +127,113 @@ export default class ConfirmPageContainer extends Component {
     const showAddToAddressDialog =
       !contact.name && toAddress && !isOwnedAccount && !hideSenderToRecipient;
 
+    const shouldDisplayWarning =
+      contentComponent && disabled && (errorKey || errorMessage);
+
+    const hideTitle =
+      (currentTransaction.type === TRANSACTION_TYPES.CONTRACT_INTERACTION ||
+        currentTransaction.type === TRANSACTION_TYPES.DEPLOY_CONTRACT) &&
+      currentTransaction.txParams?.value === '0x0';
+
     return (
-      <div className="page-container">
-        <ConfirmPageContainerNavigation
-          totalTx={totalTx}
-          positionOfCurrentTx={positionOfCurrentTx}
-          nextTxId={nextTxId}
-          prevTxId={prevTxId}
-          showNavigation={showNavigation}
-          onNextTx={(txId) => onNextTx(txId)}
-          firstTx={firstTx}
-          lastTx={lastTx}
-          ofText={ofText}
-          requestsWaitingText={requestsWaitingText}
-        />
-        <ConfirmPageContainerHeader
-          showEdit={showEdit}
-          onEdit={() => onEdit()}
-          showAccountInHeader={showAccountInHeader}
-          accountAddress={fromAddress}
-        >
-          {hideSenderToRecipient ? null : (
-            <SenderToRecipient
-              senderName={fromName}
-              senderAddress={fromAddress}
-              recipientName={toName}
-              recipientAddress={toAddress}
-              recipientEns={toEns}
-              recipientNickname={toNickname}
+      <GasFeeContextProvider transaction={currentTransaction}>
+        <div className="page-container">
+          <ConfirmPageContainerNavigation
+            totalTx={totalTx}
+            positionOfCurrentTx={positionOfCurrentTx}
+            nextTxId={nextTxId}
+            prevTxId={prevTxId}
+            showNavigation={showNavigation}
+            onNextTx={(txId) => onNextTx(txId)}
+            firstTx={firstTx}
+            lastTx={lastTx}
+            ofText={ofText}
+            requestsWaitingText={requestsWaitingText}
+          />
+          <ConfirmPageContainerHeader
+            showEdit={showEdit}
+            onEdit={() => onEdit()}
+            showAccountInHeader={showAccountInHeader}
+            accountAddress={fromAddress}
+          >
+            {hideSenderToRecipient ? null : (
+              <SenderToRecipient
+                senderName={fromName}
+                senderAddress={fromAddress}
+                recipientName={toName}
+                recipientAddress={toAddress}
+                recipientEns={toEns}
+                recipientNickname={toNickname}
+              />
+            )}
+          </ConfirmPageContainerHeader>
+          <div>
+            {showAddToAddressDialog && (
+              <Dialog
+                type="message"
+                className="send__dialog"
+                onClick={() => showAddToAddressBookModal()}
+              >
+                {this.context.t('newAccountDetectedDialogMessage')}
+              </Dialog>
+            )}
+          </div>
+          {contentComponent || (
+            <ConfirmPageContainerContent
+              action={action}
+              title={title}
+              titleComponent={titleComponent}
+              subtitleComponent={subtitleComponent}
+              hideSubtitle={hideSubtitle}
+              detailsComponent={detailsComponent}
+              dataComponent={dataComponent}
+              errorMessage={errorMessage}
+              errorKey={errorKey}
+              identiconAddress={identiconAddress}
+              nonce={nonce}
+              warning={warning}
+              onCancelAll={onCancelAll}
+              onCancel={onCancel}
+              cancelText={this.context.t('reject')}
+              onSubmit={onSubmit}
+              submitText={this.context.t('confirm')}
+              disabled={disabled}
+              unapprovedTxCount={unapprovedTxCount}
+              rejectNText={this.context.t('rejectTxsN', [unapprovedTxCount])}
+              origin={origin}
+              ethGasPriceWarning={ethGasPriceWarning}
+              hideTitle={hideTitle}
             />
           )}
-        </ConfirmPageContainerHeader>
-        <div>
-          {showAddToAddressDialog && (
-            <Dialog
-              type="message"
-              className="send__dialog"
-              onClick={() => showAddToAddressBookModal()}
+          {shouldDisplayWarning && (
+            <div className="confirm-approve-content__warning">
+              <ErrorMessage errorKey={errorKey} />
+            </div>
+          )}
+          {contentComponent && (
+            <PageContainerFooter
+              onCancel={onCancel}
+              cancelText={this.context.t('reject')}
+              onSubmit={onSubmit}
+              submitText={this.context.t('confirm')}
+              disabled={disabled}
             >
-              {this.context.t('newAccountDetectedDialogMessage')}
-            </Dialog>
+              {unapprovedTxCount > 1 && (
+                <a onClick={onCancelAll}>
+                  {this.context.t('rejectTxsN', [unapprovedTxCount])}
+                </a>
+              )}
+            </PageContainerFooter>
+          )}
+          {editingGas && (
+            <EditGasPopover
+              mode={EDIT_GAS_MODES.MODIFY_IN_PLACE}
+              onClose={handleCloseEditGas}
+              transaction={currentTransaction}
+            />
           )}
         </div>
-        {contentComponent || (
-          <ConfirmPageContainerContent
-            action={action}
-            title={title}
-            titleComponent={titleComponent}
-            subtitleComponent={subtitleComponent}
-            hideSubtitle={hideSubtitle}
-            detailsComponent={detailsComponent}
-            dataComponent={dataComponent}
-            errorMessage={errorMessage}
-            errorKey={errorKey}
-            identiconAddress={identiconAddress}
-            nonce={nonce}
-            warning={warning}
-            onCancelAll={onCancelAll}
-            onCancel={onCancel}
-            cancelText={this.context.t('reject')}
-            onSubmit={onSubmit}
-            submitText={this.context.t('confirm')}
-            disabled={disabled}
-            unapprovedTxCount={unapprovedTxCount}
-            rejectNText={this.context.t('rejectTxsN', [unapprovedTxCount])}
-            origin={origin}
-            ethGasPriceWarning={ethGasPriceWarning}
-          />
-        )}
-        {contentComponent && (
-          <PageContainerFooter
-            onCancel={onCancel}
-            cancelText={this.context.t('reject')}
-            onSubmit={onSubmit}
-            submitText={this.context.t('confirm')}
-            disabled={disabled}
-          >
-            {unapprovedTxCount > 1 && (
-              <a onClick={onCancelAll}>
-                {this.context.t('rejectTxsN', [unapprovedTxCount])}
-              </a>
-            )}
-          </PageContainerFooter>
-        )}
-        {editingGas && (
-          <EditGasPopover
-            mode={EDIT_GAS_MODES.MODIFY_IN_PLACE}
-            onClose={handleCloseEditGas}
-            transaction={currentTransaction}
-          />
-        )}
-      </div>
+      </GasFeeContextProvider>
     );
   }
 }
diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js
index 66e44bd49..4dd785874 100644
--- a/ui/components/app/dropdowns/network-dropdown.js
+++ b/ui/components/app/dropdowns/network-dropdown.js
@@ -3,19 +3,22 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import { compose } from 'redux';
+import classnames from 'classnames';
+import Button from '../../ui/button';
 import * as actions from '../../../store/actions';
 import { openAlert as displayInvalidCustomNetworkAlert } from '../../../ducks/alerts/invalid-custom-network';
-import {
-  NETWORKS_ROUTE,
-  NETWORKS_FORM_ROUTE,
-} from '../../../helpers/constants/routes';
-import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
 import { NETWORK_TYPE_RPC } from '../../../../shared/constants/network';
 import { isPrefixedFormattedHexString } from '../../../../shared/modules/network.utils';
-import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 
 import ColorIndicator from '../../ui/color-indicator';
 import { COLORS, SIZES } from '../../../helpers/constants/design-system';
+import { getShowTestNetworks } from '../../../selectors';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
+import {
+  ADD_NETWORK_ROUTE,
+  ADVANCED_ROUTE,
+} from '../../../helpers/constants/routes';
 import { Dropdown, DropdownMenuItem } from './dropdown';
 
 // classes from nodes of the toggle element.
@@ -37,8 +40,10 @@ const DROP_DOWN_MENU_ITEM_STYLE = {
 function mapStateToProps(state) {
   return {
     provider: state.metamask.provider,
+    shouldShowTestNetworks: getShowTestNetworks(state),
     frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     networkDropdownOpen: state.appState.networkDropdownOpen,
+    showTestnetMessageInDropdown: state.appState.showTestnetMessageInDropdown,
   };
 }
 
@@ -51,12 +56,6 @@ function mapDispatchToProps(dispatch) {
       dispatch(actions.setRpcTarget(target, chainId, ticker, nickname));
     },
     hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()),
-    setNetworksTabAddMode: (isInAddMode) => {
-      dispatch(actions.setNetworksTabAddMode(isInAddMode));
-    },
-    setSelectedSettingsRpcUrl: (url) => {
-      dispatch(actions.setSelectedSettingsRpcUrl(url));
-    },
     displayInvalidCustomNetworkAlert: (networkName) => {
       dispatch(displayInvalidCustomNetworkAlert(networkName));
     },
@@ -69,6 +68,7 @@ function mapDispatchToProps(dispatch) {
         }),
       );
     },
+    hideTestNetMessage: () => dispatch(actions.hideTestNetMessage()),
   };
 }
 
@@ -88,13 +88,14 @@ class NetworkDropdown extends Component {
     setProviderType: PropTypes.func.isRequired,
     setRpcTarget: PropTypes.func.isRequired,
     hideNetworkDropdown: PropTypes.func.isRequired,
-    setNetworksTabAddMode: PropTypes.func.isRequired,
-    setSelectedSettingsRpcUrl: PropTypes.func.isRequired,
     frequentRpcListDetail: PropTypes.array.isRequired,
+    shouldShowTestNetworks: PropTypes.bool,
     networkDropdownOpen: PropTypes.bool.isRequired,
-    history: PropTypes.object.isRequired,
     displayInvalidCustomNetworkAlert: PropTypes.func.isRequired,
     showConfirmDeleteNetworkModal: PropTypes.func.isRequired,
+    showTestnetMessageInDropdown: PropTypes.bool.isRequired,
+    hideTestNetMessage: PropTypes.func.isRequired,
+    history: PropTypes.object,
   };
 
   handleClick(newProviderType) {
@@ -118,6 +119,36 @@ class NetworkDropdown extends Component {
     setProviderType(newProviderType);
   }
 
+  renderAddCustomButton() {
+    const style = {
+      width: '100%',
+      left: '40px',
+      color: 'white',
+      background: 'rgba(0, 0, 0, 0.75)',
+      borderRadius: '20px',
+      textTransform: 'none',
+    };
+
+    return (
+      <Button
+        type="submit"
+        style={style}
+        variant="contained"
+        size="large"
+        onClick={() => {
+          if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
+            global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE);
+          } else {
+            this.props.history.push(ADD_NETWORK_ROUTE);
+          }
+          this.props.hideNetworkDropdown();
+        }}
+      >
+        {this.context.t('addNetwork')}
+      </Button>
+    );
+  }
+
   renderCustomRpcList(rpcListDetail, provider) {
     const reversedRpcListDetail = rpcListDetail.slice().reverse();
 
@@ -195,6 +226,8 @@ class NetworkDropdown extends Component {
       name = this.context.t('rinkeby');
     } else if (providerName === 'goerli') {
       name = this.context.t('goerli');
+    } else if (providerName === 'localhost') {
+      name = this.context.t('localhost');
     } else {
       name = provider.nickname || this.context.t('unknownNetwork');
     }
@@ -238,12 +271,15 @@ class NetworkDropdown extends Component {
 
   render() {
     const {
-      provider: { rpcUrl: activeNetwork },
-      setNetworksTabAddMode,
-      setSelectedSettingsRpcUrl,
+      history,
+      hideNetworkDropdown,
+      shouldShowTestNetworks,
+      showTestnetMessageInDropdown,
+      hideTestNetMessage,
     } = this.props;
     const rpcListDetail = this.props.frequentRpcListDetail;
     const isOpen = this.props.networkDropdownOpen;
+    const { t } = this.context;
 
     return (
       <Dropdown
@@ -257,7 +293,7 @@ class NetworkDropdown extends Component {
 
           if (notToggleElementIndex === -1) {
             event.stopPropagation();
-            this.props.hideNetworkDropdown();
+            hideNetworkDropdown();
           }
         }}
         containerClassName="network-droppo"
@@ -273,54 +309,52 @@ class NetworkDropdown extends Component {
         }}
       >
         <div className="network-dropdown-header">
-          <div className="network-dropdown-title">
-            {this.context.t('networks')}
-          </div>
+          <div className="network-dropdown-title">{t('networks')}</div>
           <div className="network-dropdown-divider" />
-          <div className="network-dropdown-content">
-            {this.context.t('defaultNetwork')}
-          </div>
+          {showTestnetMessageInDropdown ? (
+            <div className="network-dropdown-content">
+              {t('defaultNetwork', [
+                <span key="testNetworksEnabled">
+                  {shouldShowTestNetworks ? t('disable') : t('enable')}
+                </span>,
+                <a
+                  href="#"
+                  key="advancedSettingsLink"
+                  className="network-dropdown-content--link"
+                  onClick={(e) => {
+                    e.preventDefault();
+                    hideNetworkDropdown();
+                    history.push(ADVANCED_ROUTE);
+                  }}
+                >
+                  {t('here')}
+                </a>,
+              ])}
+              <button
+                title={t('dismiss')}
+                onClick={hideTestNetMessage}
+                className="fas fa-times network-dropdown-content--close"
+              />
+            </div>
+          ) : null}
         </div>
         {this.renderNetworkEntry('mainnet')}
-        {this.renderNetworkEntry('ropsten')}
-        {this.renderNetworkEntry('kovan')}
-        {this.renderNetworkEntry('rinkeby')}
-        {this.renderNetworkEntry('goerli')}
 
         {this.renderCustomRpcList(rpcListDetail, this.props.provider)}
-        <DropdownMenuItem
-          closeMenu={() => this.props.hideNetworkDropdown()}
-          onClick={() => {
-            this.props.history.push(
-              getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN
-                ? NETWORKS_ROUTE
-                : NETWORKS_FORM_ROUTE,
-            );
-            setSelectedSettingsRpcUrl('');
-            setNetworksTabAddMode(true);
-          }}
-          style={DROP_DOWN_MENU_ITEM_STYLE}
+
+        <div
+          className={classnames('network-dropdown-testnets', {
+            'network-dropdown-testnets--no-visibility': !shouldShowTestNetworks,
+          })}
         >
-          {activeNetwork === 'custom' ? (
-            <i className="fa fa-check" />
-          ) : (
-            <div className="network-check__transparent">✓</div>
-          )}
-          <ColorIndicator
-            type={ColorIndicator.TYPES.FILLED}
-            color={COLORS.TRANSPARENT}
-            borderColor={COLORS.UI2}
-            size={SIZES.LG}
-          />
-          <span
-            className="network-name-item"
-            style={{
-              color: activeNetwork === 'custom' ? '#ffffff' : '#9b9b9b',
-            }}
-          >
-            {this.context.t('customRPC')}
-          </span>
-        </DropdownMenuItem>
+          {this.renderNetworkEntry('ropsten')}
+          {this.renderNetworkEntry('kovan')}
+          {this.renderNetworkEntry('rinkeby')}
+          {this.renderNetworkEntry('goerli')}
+          {this.renderNetworkEntry('localhost')}
+        </div>
+
+        {this.renderAddCustomButton()}
       </Dropdown>
     );
   }
diff --git a/ui/components/app/dropdowns/network-dropdown.test.js b/ui/components/app/dropdowns/network-dropdown.test.js
index f68fddd93..263460b85 100644
--- a/ui/components/app/dropdowns/network-dropdown.test.js
+++ b/ui/components/app/dropdowns/network-dropdown.test.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+import Button from '../../ui/button';
 import { mountWithRouter } from '../../../../test/lib/render-helpers';
 import ColorIndicator from '../../ui/color-indicator';
 import NetworkDropdown from './network-dropdown';
@@ -17,6 +18,9 @@ describe('Network Dropdown', () => {
         provider: {
           type: 'test',
         },
+        preferences: {
+          showTestNetworks: true,
+        },
       },
       appState: {
         networkDropdownOpen: false,
@@ -38,13 +42,16 @@ describe('Network Dropdown', () => {
     });
   });
 
-  describe('NetworkDropdown in appState is true', () => {
+  describe('NetworkDropdown in appState is true and show test networks is true', () => {
     const mockState = {
       metamask: {
         network: '1',
         provider: {
           type: 'test',
         },
+        preferences: {
+          showTestNetworks: true,
+        },
         frequentRpcListDetail: [
           { chainId: '0x1a', rpcUrl: 'http://localhost:7545' },
           { rpcUrl: 'http://localhost:7546' },
@@ -54,14 +61,32 @@ describe('Network Dropdown', () => {
         networkDropdownOpen: true,
       },
     };
+
+    global.platform = {
+      openExtensionInBrowser: jest.fn(),
+    };
+
     const store = createMockStore(mockState);
 
-    beforeEach(() => {
-      wrapper = mountWithRouter(<NetworkDropdown store={store} />);
-    });
+    let testNetworkIndex = 1;
+
+    const findTestNetworkFirstIndex = (_wrapper) => {
+      let i = 1;
+      let found = false;
+      while (!found) {
+        if (_wrapper.find(ColorIndicator).at(i).prop('color') === 'ui-2') {
+          i += 1;
+        } else {
+          found = true;
+        }
+      }
 
-    it('renders 8 DropDownMenuItems', () => {
-      expect(wrapper.find(DropdownMenuItem)).toHaveLength(8);
+      testNetworkIndex = i;
+    };
+
+    beforeAll(() => {
+      wrapper = mountWithRouter(<NetworkDropdown store={store} />);
+      findTestNetworkFirstIndex(wrapper);
     });
 
     it('checks background color for first ColorIndicator', () => {
@@ -71,41 +96,99 @@ describe('Network Dropdown', () => {
     });
 
     it('checks background color for second ColorIndicator', () => {
-      const colorIndicator = wrapper.find(ColorIndicator).at(1);
+      // find where test networks start in case there are custom RPCs
+      const colorIndicator = wrapper.find(ColorIndicator).at(testNetworkIndex);
       expect(colorIndicator.prop('color')).toStrictEqual('ropsten');
       expect(colorIndicator.prop('borderColor')).toStrictEqual('ropsten');
     });
 
     it('checks background color for third ColorIndicator', () => {
-      const colorIndicator = wrapper.find(ColorIndicator).at(2);
+      const colorIndicator = wrapper
+        .find(ColorIndicator)
+        .at(testNetworkIndex + 1);
       expect(colorIndicator.prop('color')).toStrictEqual('kovan');
       expect(colorIndicator.prop('borderColor')).toStrictEqual('kovan');
     });
 
     it('checks background color for fourth ColorIndicator', () => {
-      const colorIndicator = wrapper.find(ColorIndicator).at(3);
+      const colorIndicator = wrapper
+        .find(ColorIndicator)
+        .at(testNetworkIndex + 2);
       expect(colorIndicator.prop('color')).toStrictEqual('rinkeby');
       expect(colorIndicator.prop('borderColor')).toStrictEqual('rinkeby');
     });
 
     it('checks background color for fifth ColorIndicator', () => {
-      const colorIndicator = wrapper.find(ColorIndicator).at(4);
+      const colorIndicator = wrapper
+        .find(ColorIndicator)
+        .at(testNetworkIndex + 3);
       expect(colorIndicator.prop('color')).toStrictEqual('goerli');
       expect(colorIndicator.prop('borderColor')).toStrictEqual('goerli');
     });
 
     it('checks background color for sixth ColorIndicator', () => {
-      const colorIndicator = wrapper.find(ColorIndicator).at(5);
-      const customNetworkGray = 'ui-2';
-      expect(colorIndicator.prop('color')).toStrictEqual(customNetworkGray);
-      expect(colorIndicator.prop('borderColor')).toStrictEqual(
-        customNetworkGray,
+      const colorIndicator = wrapper
+        .find(ColorIndicator)
+        .at(testNetworkIndex + 4);
+      expect(colorIndicator.prop('color')).toStrictEqual('localhost');
+      expect(colorIndicator.prop('borderColor')).toStrictEqual('localhost');
+      expect(
+        wrapper
+          .find(DropdownMenuItem)
+          .at(testNetworkIndex + 4)
+          .text(),
+      ).toStrictEqual('✓localhost');
+    });
+
+    it('checks that Add Network button is rendered', () => {
+      expect(wrapper.find(Button).at(0).children().text()).toStrictEqual(
+        'addNetwork',
+      );
+    });
+  });
+
+  describe('NetworkDropdown in appState is true and show test networks is false', () => {
+    const mockState = {
+      metamask: {
+        network: '1',
+        provider: {
+          type: 'test',
+        },
+        preferences: {
+          showTestNetworks: false,
+        },
+        frequentRpcListDetail: [
+          { chainId: '0x1a', rpcUrl: 'http://localhost:7545' },
+          { rpcUrl: 'http://localhost:7546' },
+        ],
+      },
+      appState: {
+        networkDropdownOpen: true,
+      },
+    };
+
+    global.platform = {
+      openExtensionInBrowser: jest.fn(),
+    };
+
+    const store = createMockStore(mockState);
+
+    beforeAll(() => {
+      wrapper = mountWithRouter(<NetworkDropdown store={store} />);
+    });
+
+    it('checks background color for first ColorIndicator', () => {
+      const colorIndicator = wrapper.find(ColorIndicator).at(0);
+      expect(colorIndicator.prop('color')).toStrictEqual('mainnet');
+      expect(colorIndicator.prop('borderColor')).toStrictEqual('mainnet');
+      expect(wrapper.find(DropdownMenuItem).at(0).text()).toStrictEqual(
+        '✓mainnet',
       );
     });
 
-    it('checks dropdown for frequestRPCList from state', () => {
-      expect(wrapper.find(DropdownMenuItem).at(6).text()).toStrictEqual(
-        '✓http://localhost:7545',
+    it('checks that Add Network button is rendered', () => {
+      expect(wrapper.find(Button).at(0).children().text()).toStrictEqual(
+        'addNetwork',
       );
     });
   });
diff --git a/ui/components/app/edit-gas-display/edit-gas-display.component.js b/ui/components/app/edit-gas-display/edit-gas-display.component.js
index f95f6ebc7..99e7e17f6 100644
--- a/ui/components/app/edit-gas-display/edit-gas-display.component.js
+++ b/ui/components/app/edit-gas-display/edit-gas-display.component.js
@@ -6,6 +6,7 @@ import {
   GAS_RECOMMENDATIONS,
   EDIT_GAS_MODES,
   GAS_ESTIMATE_TYPES,
+  CUSTOM_GAS_ESTIMATE,
 } from '../../../../shared/constants/gas';
 
 import Button from '../../ui/button';
@@ -34,6 +35,8 @@ import ActionableMessage from '../../ui/actionable-message/actionable-message';
 import { I18nContext } from '../../../contexts/i18n';
 import GasTiming from '../gas-timing';
 
+import { useMetricEvent } from '../../../hooks/useMetricEvent';
+
 export default function EditGasDisplay({
   mode = EDIT_GAS_MODES.MODIFY_IN_PLACE,
   showEducationButton = false,
@@ -82,7 +85,7 @@ export default function EditGasDisplay({
   );
 
   const [showAdvancedForm, setShowAdvancedForm] = useState(
-    !estimateToUse || estimateToUse === 'custom' || !supportsEIP1559,
+    !estimateToUse || estimateToUse === CUSTOM_GAS_ESTIMATE || !supportsEIP1559,
   );
   const [hideRadioButtons, setHideRadioButtons] = useState(
     showAdvancedInlineGasIfPossible,
@@ -119,6 +122,14 @@ export default function EditGasDisplay({
     errorKey = 'gasEstimatesUnavailableWarning';
   }
 
+  const clickedAdvancedOptionsMetricsEvent = useMetricEvent({
+    eventOpts: {
+      category: 'Transactions',
+      action: 'Edit Screen',
+      name: 'Clicked "Advanced Options"',
+    },
+  });
+
   return (
     <div className="edit-gas-display">
       <div className="edit-gas-display__content">
@@ -250,7 +261,10 @@ export default function EditGasDisplay({
           !showAdvancedInlineGasIfPossible && (
             <button
               className="edit-gas-display__advanced-button"
-              onClick={() => setShowAdvancedForm(!showAdvancedForm)}
+              onClick={() => {
+                setShowAdvancedForm(!showAdvancedForm);
+                clickedAdvancedOptionsMetricsEvent();
+              }}
             >
               {t('advancedOptions')}{' '}
               {showAdvancedForm ? (
diff --git a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
index e9ab37249..60b73d170 100644
--- a/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
+++ b/ui/components/app/edit-gas-popover/edit-gas-popover.component.js
@@ -4,7 +4,12 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useGasFeeInputs } from '../../../hooks/gasFeeInput/useGasFeeInputs';
 import { getGasLoadingAnimationIsShowing } from '../../../ducks/app/app';
 import { txParamsAreDappSuggested } from '../../../../shared/modules/transaction.utils';
-import { EDIT_GAS_MODES, GAS_LIMITS } from '../../../../shared/constants/gas';
+import {
+  EDIT_GAS_MODES,
+  GAS_LIMITS,
+  GAS_RECOMMENDATIONS,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../../../shared/constants/gas';
 
 import {
   decGWEIToHexWEI,
@@ -35,7 +40,7 @@ export default function EditGasPopover({
   popoverTitle = '',
   confirmButtonText = '',
   editGasDisplayProps = {},
-  defaultEstimateToUse = 'medium',
+  defaultEstimateToUse = GAS_RECOMMENDATIONS.MEDIUM,
   transaction,
   mode,
   onClose,
@@ -70,7 +75,7 @@ export default function EditGasPopover({
   if (mode === EDIT_GAS_MODES.SPEED_UP || mode === EDIT_GAS_MODES.CANCEL) {
     updatedTransaction = {
       ...transaction,
-      userFeeLevel: 'custom',
+      userFeeLevel: CUSTOM_GAS_ESTIMATE,
       txParams: {
         ...transaction.txParams,
         ...updatedCustomGasSettings,
@@ -112,7 +117,8 @@ export default function EditGasPopover({
   );
 
   const txParamsHaveBeenCustomized =
-    estimateToUse === 'custom' || txParamsAreDappSuggested(updatedTransaction);
+    estimateToUse === CUSTOM_GAS_ESTIMATE ||
+    txParamsAreDappSuggested(updatedTransaction);
 
   /**
    * Temporary placeholder, this should be managed by the parent component but
@@ -157,7 +163,7 @@ export default function EditGasPopover({
 
     const updatedTxMeta = {
       ...updatedTransaction,
-      userFeeLevel: estimateToUse || 'custom',
+      userFeeLevel: estimateToUse || CUSTOM_GAS_ESTIMATE,
       txParams: {
         ...cleanTransactionParams,
         ...newGasSettings,
@@ -185,7 +191,9 @@ export default function EditGasPopover({
       case EDIT_GAS_MODES.SWAPS:
         // This popover component should only be used for the "FEE_MARKET" type in Swaps.
         if (supportsEIP1559) {
-          dispatch(updateSwapsUserFeeLevel(estimateToUse || 'custom'));
+          dispatch(
+            updateSwapsUserFeeLevel(estimateToUse || CUSTOM_GAS_ESTIMATE),
+          );
           dispatch(updateCustomSwapsEIP1559GasParams(newGasSettings));
         }
         break;
diff --git a/ui/components/app/edit-gas-popover/edit-gas-popover.stories.js b/ui/components/app/edit-gas-popover/edit-gas-popover.stories.js
index b18d834be..cf26bdb1c 100644
--- a/ui/components/app/edit-gas-popover/edit-gas-popover.stories.js
+++ b/ui/components/app/edit-gas-popover/edit-gas-popover.stories.js
@@ -5,7 +5,11 @@ import { boolean } from '@storybook/addon-knobs';
 import { decGWEIToHexWEI } from '../../../helpers/utils/conversions.util';
 import configureStore from '../../../store/store';
 import testData from '../../../../.storybook/test-data';
-import { EDIT_GAS_MODES } from '../../../../shared/constants/gas';
+import {
+  EDIT_GAS_MODES,
+  GAS_RECOMMENDATIONS,
+} from '../../../../shared/constants/gas';
+
 import EditGasPopover from '.';
 
 const store = configureStore(testData);
@@ -21,7 +25,7 @@ export const Basic = () => {
     <div style={{ width: '600px' }}>
       <EditGasPopover
         transaction={{
-          userFeeLevel: 'medium',
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
           txParams: {
             maxFeePerGas: decGWEIToHexWEI('10000'),
             maxPriorityFeePerGas: '0x5600',
@@ -29,7 +33,7 @@ export const Basic = () => {
             gasPrice: '0x5600',
           },
         }}
-        defaultEstimateToUse="high"
+        defaultEstimateToUse={GAS_RECOMMENDATIONS.HIGH}
         mode={EDIT_GAS_MODES.SWAPS}
         confirmButtonText="Submit"
         onClose={() => action(`Close Edit Gas Popover`)()}
@@ -45,7 +49,7 @@ export const BasicWithDifferentButtonText = () => {
       <EditGasPopover
         confirmButtonText="Custom Value"
         transaction={{
-          userFeeLevel: 'medium',
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
           txParams: {
             maxFeePerGas: decGWEIToHexWEI('10000'),
             maxPriorityFeePerGas: '0x5600',
@@ -53,7 +57,7 @@ export const BasicWithDifferentButtonText = () => {
             gasPrice: '0x5600',
           },
         }}
-        defaultEstimateToUse="high"
+        defaultEstimateToUse={GAS_RECOMMENDATIONS.HIGH}
         mode={EDIT_GAS_MODES.SWAPS}
         onClose={() => action(`Close Edit Gas Popover`)()}
         minimumGasLimit="5700"
@@ -70,7 +74,7 @@ export const EducationalContentFlow = () => {
           showEducationButton: boolean('Show Education Button', true),
         }}
         transaction={{
-          userFeeLevel: 'medium',
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
           txParams: {
             maxFeePerGas: decGWEIToHexWEI('10000'),
             maxPriorityFeePerGas: '0x5600',
@@ -78,7 +82,7 @@ export const EducationalContentFlow = () => {
             gasPrice: '0x5600',
           },
         }}
-        defaultEstimateToUse="high"
+        defaultEstimateToUse={GAS_RECOMMENDATIONS.HIGH}
         mode={EDIT_GAS_MODES.SWAPS}
         confirmButtonText="Submit"
         onClose={() => action(`Close Edit Gas Popover`)()}
diff --git a/ui/components/app/gas-timing/gas-timing.component.js b/ui/components/app/gas-timing/gas-timing.component.js
index 95e5bc24a..41fc6bed5 100644
--- a/ui/components/app/gas-timing/gas-timing.component.js
+++ b/ui/components/app/gas-timing/gas-timing.component.js
@@ -24,9 +24,12 @@ import InfoTooltip from '../../ui/info-tooltip/info-tooltip';
 
 import { getGasFeeTimeEstimate } from '../../../store/actions';
 import { GAS_FORM_ERRORS } from '../../../helpers/constants/gas';
+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) => {
@@ -47,6 +50,7 @@ export default function GasTiming({
 
   const [customEstimatedTime, setCustomEstimatedTime] = useState(null);
   const t = useContext(I18nContext);
+  const { estimateToUse } = 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
@@ -92,12 +96,17 @@ export default function GasTiming({
     previousIsUnknownLow,
   ]);
 
-  const unknownProcessingTimeText = (
-    <>
-      {t('editGasTooLow')}{' '}
-      <InfoTooltip position="top" contentText={t('editGasTooLowTooltip')} />
-    </>
-  );
+  let unknownProcessingTimeText;
+  if (EIP_1559_V2) {
+    unknownProcessingTimeText = t('editGasTooLow');
+  } else {
+    unknownProcessingTimeText = (
+      <>
+        {t('editGasTooLow')}{' '}
+        <InfoTooltip position="top" contentText={t('editGasTooLowTooltip')} />
+      </>
+    );
+  }
 
   if (
     gasWarnings?.maxPriorityFee === GAS_FORM_ERRORS.MAX_PRIORITY_FEE_TOO_LOW ||
@@ -146,8 +155,9 @@ export default function GasTiming({
       ]);
     }
   } else {
-    attitude = 'negative';
-
+    if (!EIP_1559_V2 || estimateToUse === 'low') {
+      attitude = 'negative';
+    }
     // If the user has chosen a value less than our low estimate,
     // calculate a potential wait time
     if (isUnknownLow) {
@@ -164,6 +174,12 @@ export default function GasTiming({
           toHumanReadableTime(Number(customEstimatedTime?.upperTimeBound), t),
         ]);
       }
+    }
+    // code below needs to cleaned-up once EIP_1559_V2 flag is removed
+    else if (EIP_1559_V2) {
+      text = t('gasTimingNegative', [
+        toHumanReadableTime(low.maxWaitTimeEstimate, t),
+      ]);
     } else {
       text = (
         <>
@@ -183,7 +199,8 @@ export default function GasTiming({
     <Typography
       variant={TYPOGRAPHY.H7}
       className={classNames('gas-timing', {
-        [`gas-timing--${attitude}`]: attitude,
+        [`gas-timing--${attitude}`]: attitude && !EIP_1559_V2,
+        [`gas-timing--${attitude}-V2`]: attitude && EIP_1559_V2,
       })}
     >
       {text}
diff --git a/ui/components/app/gas-timing/index.scss b/ui/components/app/gas-timing/index.scss
index 52b0f58c1..20d0b451f 100644
--- a/ui/components/app/gas-timing/index.scss
+++ b/ui/components/app/gas-timing/index.scss
@@ -14,6 +14,11 @@
     font-weight: bold;
   }
 
+  &--negative-V2 {
+    color: $secondary-1;
+    font-weight: bold;
+  }
+
   .info-tooltip {
     display: inline-block;
     margin-inline-start: 4px;
diff --git a/ui/components/app/modals/account-details-modal/account-details-modal.component.js b/ui/components/app/modals/account-details-modal/account-details-modal.component.js
index 72767f310..1df675a01 100644
--- a/ui/components/app/modals/account-details-modal/account-details-modal.component.js
+++ b/ui/components/app/modals/account-details-modal/account-details-modal.component.js
@@ -7,6 +7,7 @@ import QrView from '../../../ui/qr-code';
 import EditableLabel from '../../../ui/editable-label';
 import Button from '../../../ui/button';
 import { getURLHostName } from '../../../../helpers/utils/util';
+import { isHardwareKeyring } from '../../../../helpers/utils/hardware';
 
 export default class AccountDetailsModal extends Component {
   static propTypes = {
@@ -40,7 +41,7 @@ export default class AccountDetailsModal extends Component {
 
     let exportPrivateKeyFeatureEnabled = true;
     // This feature is disabled for hardware wallets
-    if (keyring?.type?.search('Hardware') !== -1) {
+    if (isHardwareKeyring(keyring?.type)) {
       exportPrivateKeyFeatureEnabled = false;
     }
 
@@ -83,9 +84,7 @@ export default class AccountDetailsModal extends Component {
             ? this.context.t('blockExplorerView', [
                 getURLHostName(rpcPrefs.blockExplorerUrl),
               ])
-            : this.context.t('viewOnEtherscan', [
-                this.context.t('blockExplorerAccountAction'),
-              ])}
+            : this.context.t('etherscanViewOn')}
         </Button>
 
         {exportPrivateKeyFeatureEnabled ? (
diff --git a/ui/components/app/modals/account-details-modal/index.scss b/ui/components/app/modals/account-details-modal/index.scss
index ecab51311..3eedab80c 100644
--- a/ui/components/app/modals/account-details-modal/index.scss
+++ b/ui/components/app/modals/account-details-modal/index.scss
@@ -8,13 +8,13 @@
   & &__button {
     margin-top: 17px;
     padding: 10px 22px;
-    width: 286px;
+    width: 284px;
   }
 
   &__divider {
     width: 100%;
     height: 1px;
-    margin: 19px 0 8px 0;
+    margin: 16px 0 8px 0;
     background-color: $alto;
   }
 
diff --git a/ui/components/app/modals/edit-approval-permission/edit-approval-permission.component.js b/ui/components/app/modals/edit-approval-permission/edit-approval-permission.component.js
index b6cfec569..373d2c1d3 100644
--- a/ui/components/app/modals/edit-approval-permission/edit-approval-permission.component.js
+++ b/ui/components/app/modals/edit-approval-permission/edit-approval-permission.component.js
@@ -103,11 +103,11 @@ export default class EditApprovalPermission extends PureComponent {
                   'edit-approval-permission__edit-section__option-label--selected': selectedOptionIsUnlimited,
                 })}
               >
-                {new BigNumber(tokenAmount).lessThan(
-                  new BigNumber(tokenBalance),
+                {new BigNumber(tokenAmount).equals(
+                  new BigNumber(MAX_UNSIGNED_256_INT),
                 )
-                  ? t('proposedApprovalLimit')
-                  : t('unlimited')}
+                  ? t('unlimited')
+                  : t('proposedApprovalLimit')}
               </div>
               <div className="edit-approval-permission__edit-section__option-description">
                 {t('spendLimitRequestedBy', [origin])}
diff --git a/ui/components/app/modals/modal.js b/ui/components/app/modals/modal.js
index 16a5d4807..c31cba238 100644
--- a/ui/components/app/modals/modal.js
+++ b/ui/components/app/modals/modal.js
@@ -64,7 +64,7 @@ const accountModalStyle = {
     margin: '0 auto',
   },
   laptopModalStyle: {
-    width: '360px',
+    width: '335px',
     // top: 'calc(33% + 45px)',
     boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
     borderRadius: '4px',
diff --git a/ui/components/app/network-display/index.scss b/ui/components/app/network-display/index.scss
index 51ce5bcdc..9e0a0df9b 100644
--- a/ui/components/app/network-display/index.scss
+++ b/ui/components/app/network-display/index.scss
@@ -35,6 +35,10 @@
     background-color: lighten($dodger-blue, 35%);
   }
 
+  &--localhost {
+    background-color: lighten($blue-lagoon, 68%);
+  }
+
   &.chip {
     margin: 0;
     max-width: 100%;
diff --git a/ui/components/app/tab-bar/index.scss b/ui/components/app/tab-bar/index.scss
index c6bac6edc..6160f64c2 100644
--- a/ui/components/app/tab-bar/index.scss
+++ b/ui/components/app/tab-bar/index.scss
@@ -61,9 +61,8 @@
       @media screen and (max-width: $break-small) {
         display: block;
         background-image: url('/images/caret-right.svg');
-        width: 36px;
-        height: 36px;
-        opacity: 0.5;
+        width: 8.27px;
+        height: 13.64px;
         background-size: contain;
         background-repeat: no-repeat;
         background-position: center;
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown.test.js b/ui/components/app/transaction-breakdown/transaction-breakdown.test.js
index 6fec2e3ca..f1f9645eb 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown.test.js
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown.test.js
@@ -51,7 +51,7 @@ describe('TransactionBreakdown', () => {
         ['Amount', '-0.01 ETH'],
         ['Gas Limit (units)', '46890'],
         ['Gas price', '2.467043803'],
-        ['Total', '0.010116ETH'],
+        ['Total', '0.01011568ETH'],
       ]);
     });
   });
@@ -90,7 +90,7 @@ describe('TransactionBreakdown', () => {
         ['Priority Fee (GWEI)', '2.467043796'],
         ['Total Gas Fee', '0.000077ETH'],
         ['Max Fee Per Gas', '0.000000003ETH'],
-        ['Total', '0.010077ETH'],
+        ['Total', '0.01007712ETH'],
       ]);
     });
   });
diff --git a/ui/components/app/transaction-detail-item/index.scss b/ui/components/app/transaction-detail-item/index.scss
index a2dc8e4cd..8d6c1bcd7 100644
--- a/ui/components/app/transaction-detail-item/index.scss
+++ b/ui/components/app/transaction-detail-item/index.scss
@@ -1,5 +1,7 @@
 .transaction-detail-item {
   color: $ui-4;
+  padding: 20px 0;
+  border-bottom: 1px solid $ui-3;
 
   &__row {
     display: flex;
@@ -36,4 +38,21 @@
   .currency-display-component {
     display: inline;
   }
+
+  &:first-of-type {
+    padding-top: 0;
+  }
+
+  &:last-of-type {
+    margin-bottom: 20px;
+  }
+
+  &:first-child {
+    padding-top: 0;
+  }
+
+  &:last-child {
+    padding-bottom: 0;
+    border-bottom: 0;
+  }
 }
diff --git a/ui/components/app/transaction-detail/index.scss b/ui/components/app/transaction-detail/index.scss
index 13c2601c8..35bcf27c9 100644
--- a/ui/components/app/transaction-detail/index.scss
+++ b/ui/components/app/transaction-detail/index.scss
@@ -16,21 +16,54 @@
     }
   }
 
-  &-rows &-item:first-child {
-    padding-top: 0;
-  }
+  &-edit-V2 {
+    margin-bottom: 10px;
+    display: flex;
+    align-items: baseline;
+    justify-content: flex-end;
+    padding-top: 20px;
+
+    button {
+      @include H7;
+
+      display: flex;
+      align-items: baseline;
+      color: $primary-1;
+      background: transparent;
+      border: 0;
+      padding-inline-end: 0;
+      white-space: pre;
+    }
 
-  &-item {
-    padding: 20px 0;
-    border-bottom: 1px solid $ui-3;
+    i {
+      color: $primary-1;
+      margin-right: 2px;
+    }
 
-    &:first-child {
-      padding-top: 0;
+    &__icon {
+      font-size: 1rem;
     }
 
-    &:last-child {
-      padding-bottom: 0;
-      border-bottom: 0;
+    &__label {
+      font-size: 12px;
+      margin-right: 8px;
+    }
+
+    .info-tooltip {
+      align-self: center;
+      margin-left: 6px;
+    }
+
+    &__tooltip {
+      p {
+        color: $Grey-500;
+      }
+
+      b {
+        color: $neutral-black;
+        display: inline-block;
+        min-width: 60%;
+      }
     }
   }
 }
diff --git a/ui/components/app/transaction-detail/transaction-detail.component.js b/ui/components/app/transaction-detail/transaction-detail.component.js
index 0829df684..b06d43af8 100644
--- a/ui/components/app/transaction-detail/transaction-detail.component.js
+++ b/ui/components/app/transaction-detail/transaction-detail.component.js
@@ -2,11 +2,94 @@ import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 
 import { I18nContext } from '../../../contexts/i18n';
+import { useGasFeeContext } from '../../../contexts/gasFee';
+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';
+
+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);
+  const {
+    estimateToUse,
+    gasLimit,
+    gasPrice,
+    isUsingDappSuggestedGasFees,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+    transaction,
+    supportsEIP1559,
+  } = useGasFeeContext();
+  const estimateUsed = isUsingDappSuggestedGasFees
+    ? 'dappSuggested'
+    : estimateToUse;
+
+  if (EIP_1559_V2 && estimateUsed) {
+    return (
+      <div className="transaction-detail">
+        <div className="transaction-detail-edit-V2">
+          <button onClick={onEdit}>
+            <span className="transaction-detail-edit-V2__icon">
+              {`${GasLevelIconMap[estimateUsed]} `}
+            </span>
+            <span className="transaction-detail-edit-V2__label">
+              {t(estimateUsed)}
+            </span>
+            <i className="fas fa-chevron-right asset-list-item__chevron-right" />
+          </button>
+          {estimateUsed === 'custom' && onEdit && (
+            <button onClick={onEdit}>{t('edit')}</button>
+          )}
+          {estimateUsed === 'dappSuggested' && (
+            <InfoTooltip
+              contentText={
+                <div className="transaction-detail-edit-V2__tooltip">
+                  <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('gasLimit')}</b>
+                    {gasLimit}
+                  </Typography>
+                </div>
+              }
+              position="top"
+            />
+          )}
+        </div>
+        <div className="transaction-detail-rows">{rows}</div>
+      </div>
+    );
+  }
 
   return (
     <div className="transaction-detail">
diff --git a/ui/components/app/transaction-detail/transaction-detail.component.test.js b/ui/components/app/transaction-detail/transaction-detail.component.test.js
new file mode 100644
index 000000000..a95cf1565
--- /dev/null
+++ b/ui/components/app/transaction-detail/transaction-detail.component.test.js
@@ -0,0 +1,94 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+
+import { ETH } from '../../../helpers/constants/common';
+import { GasFeeContextProvider } from '../../../contexts/gasFee';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+
+import TransactionDetail from './transaction-detail.component';
+
+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',
+      featureFlags: { advancedInlineGas: true },
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider {...props}>
+      <TransactionDetail
+        onEdit={() => {
+          console.log('on edit');
+        }}
+        rows={[]}
+        {...props}
+      />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+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' } });
+    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' } });
+    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' } });
+    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 },
+      },
+    });
+    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',
+    });
+    expect(screen.queryByText('⚙')).toBeInTheDocument();
+    expect(screen.queryByText('Advanced')).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 27a64f2e9..a0f95f470 100644
--- a/ui/components/app/transaction-list-item-details/index.scss
+++ b/ui/components/app/transaction-list-item-details/index.scss
@@ -6,11 +6,6 @@
     align-items: center;
   }
 
-  &__body {
-    background: #fafbfc;
-    padding: 8px 16px;
-  }
-
   &__header-buttons {
     display: flex;
     flex-direction: row;
@@ -41,6 +36,7 @@
   &__cards-container {
     display: flex;
     flex-direction: column;
+    padding: 8px 16px;
   }
 
   &__transaction-breakdown {
@@ -53,6 +49,5 @@
   &__transaction-activity-log {
     flex: 2;
     min-width: 0;
-    padding-left: 12px;
   }
 }
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 a940cfcaa..335859aa3 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
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import copyToClipboard from 'copy-to-clipboard';
 import { getBlockExplorerLink } from '@metamask/etherscan-link';
 import SenderToRecipient from '../../ui/sender-to-recipient';
-import { FLAT_VARIANT } from '../../ui/sender-to-recipient/sender-to-recipient.constants';
+import { DEFAULT_VARIANT } from '../../ui/sender-to-recipient/sender-to-recipient.constants';
 import TransactionActivityLog from '../transaction-activity-log';
 import TransactionBreakdown from '../transaction-breakdown';
 import Button from '../../ui/button';
@@ -215,7 +215,7 @@ export default class TransactionListItemDetails extends PureComponent {
             <div className="transaction-list-item-details__sender-to-recipient-container">
               <SenderToRecipient
                 warnUserOnAccountMismatch={false}
-                variant={FLAT_VARIANT}
+                variant={DEFAULT_VARIANT}
                 addressOnly
                 recipientEns={recipientEns}
                 recipientAddress={recipientAddress}
diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index ef822ca05..1579c5830 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -34,6 +34,7 @@ import BuyIcon from '../../ui/icon/overview-buy-icon.component';
 import SendIcon from '../../ui/icon/overview-send-icon.component';
 import { setSwapsFromToken } from '../../../ducks/swaps/swaps';
 import IconButton from '../../ui/icon-button';
+import { isHardwareKeyring } from '../../../helpers/utils/hardware';
 import WalletOverview from './wallet-overview';
 
 const EthOverview = ({ className }) => {
@@ -55,7 +56,7 @@ const EthOverview = ({ className }) => {
   });
   const history = useHistory();
   const keyring = useSelector(getCurrentKeyring);
-  const usingHardwareWallet = keyring.type.search('Hardware') !== -1;
+  const usingHardwareWallet = isHardwareKeyring(keyring.type);
   const balanceIsCached = useSelector(isBalanceCached);
   const showFiat = useSelector(getShouldShowFiat);
   const selectedAccount = useSelector(getSelectedAccount);
diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js
index 0b5476261..1db872854 100644
--- a/ui/components/app/wallet-overview/token-overview.js
+++ b/ui/components/app/wallet-overview/token-overview.js
@@ -7,6 +7,7 @@ import Identicon from '../../ui/identicon';
 import Tooltip from '../../ui/tooltip';
 import CurrencyDisplay from '../../ui/currency-display';
 import { I18nContext } from '../../../contexts/i18n';
+import { isHardwareKeyring } from '../../../helpers/utils/hardware';
 import {
   SEND_ROUTE,
   BUILD_QUOTE_ROUTE,
@@ -42,7 +43,7 @@ const TokenOverview = ({ className, token }) => {
   });
   const history = useHistory();
   const keyring = useSelector(getCurrentKeyring);
-  const usingHardwareWallet = keyring.type.search('Hardware') !== -1;
+  const usingHardwareWallet = isHardwareKeyring(keyring.type);
   const { tokensWithBalances } = useTokenTracker([token]);
   const balanceToRender = tokensWithBalances[0]?.string;
   const balance = tokensWithBalances[0]?.balance;
diff --git a/ui/components/ui/actionable-message/actionable-message.js b/ui/components/ui/actionable-message/actionable-message.js
index 746a9d2a4..8af6646c7 100644
--- a/ui/components/ui/actionable-message/actionable-message.js
+++ b/ui/components/ui/actionable-message/actionable-message.js
@@ -6,11 +6,13 @@ import InfoTooltipIcon from '../info-tooltip/info-tooltip-icon';
 
 const CLASSNAME_WARNING = 'actionable-message--warning';
 const CLASSNAME_DANGER = 'actionable-message--danger';
+const CLASSNAME_INFO = 'actionable-message--info';
 const CLASSNAME_WITH_RIGHT_BUTTON = 'actionable-message--with-right-button';
 
 const typeHash = {
   warning: CLASSNAME_WARNING,
   danger: CLASSNAME_DANGER,
+  info: CLASSNAME_INFO,
   default: '',
 };
 
diff --git a/ui/components/ui/actionable-message/index.scss b/ui/components/ui/actionable-message/index.scss
index cbb1f8ba6..942123b4e 100644
--- a/ui/components/ui/actionable-message/index.scss
+++ b/ui/components/ui/actionable-message/index.scss
@@ -85,6 +85,15 @@
     }
   }
 
+  &--info {
+    background: $Green-000;
+    border: 1px solid $Green-200;
+
+    .actionable-message__message {
+      color: $Black-100;
+    }
+  }
+
   &--left-aligned {
     .actionable-message__message,
     .actionable-message__actions {
diff --git a/ui/components/ui/box/box.js b/ui/components/ui/box/box.js
index b720ff2fc..b9fc2f5ce 100644
--- a/ui/components/ui/box/box.js
+++ b/ui/components/ui/box/box.js
@@ -11,6 +11,7 @@ import {
   SIZES,
   TEXT_ALIGN,
   FLEX_DIRECTION,
+  FLEX_WRAP,
 } from '../../../helpers/constants/design-system';
 
 const ValidSize = PropTypes.oneOf([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
@@ -77,11 +78,14 @@ export default function Box({
   justifyContent,
   textAlign,
   flexDirection = FLEX_DIRECTION.ROW,
+  flexWrap,
+  gap,
   display,
   width,
   height,
   children,
   className,
+  backgroundColor,
 }) {
   const boxClassName = classnames('box', className, {
     // ---Borders---
@@ -121,6 +125,7 @@ export default function Box({
     [`box--justify-content-${justifyContent}`]: Boolean(justifyContent),
     [`box--align-items-${alignItems}`]: Boolean(alignItems),
     [`box--flex-direction-${flexDirection}`]: Boolean(flexDirection),
+    [`box--flex-wrap-${flexWrap}`]: Boolean(flexWrap),
     // text align
     [`box--text-align-${textAlign}`]: Boolean(textAlign),
     // display
@@ -128,6 +133,9 @@ export default function Box({
     // width & height
     [`box--width-${width}`]: Boolean(width),
     [`box--height-${height}`]: Boolean(height),
+    // background
+    [`box--background-color-${backgroundColor}`]: Boolean(backgroundColor),
+    ...generateSizeClasses('box', 'gap', gap),
   });
   // Apply Box styles to any other component using function pattern
   if (typeof children === 'function') {
@@ -139,6 +147,8 @@ export default function Box({
 Box.propTypes = {
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
   flexDirection: PropTypes.oneOf(Object.values(FLEX_DIRECTION)),
+  flexWrap: PropTypes.oneOf(Object.values(FLEX_WRAP)),
+  gap: ValidSize,
   margin: MultipleSizes,
   marginTop: ValidSize,
   marginBottom: ValidSize,
@@ -159,5 +169,6 @@ Box.propTypes = {
   display: PropTypes.oneOf(Object.values(DISPLAY)),
   width: PropTypes.oneOf(Object.values(BLOCK_SIZES)),
   height: PropTypes.oneOf(Object.values(BLOCK_SIZES)),
+  backgroundColor: PropTypes.oneOf(Object.values(COLORS)),
   className: PropTypes.string,
 };
diff --git a/ui/components/ui/box/box.scss b/ui/components/ui/box/box.scss
index 59865bbf7..27d146c84 100644
--- a/ui/components/ui/box/box.scss
+++ b/ui/components/ui/box/box.scss
@@ -2,10 +2,10 @@
 @use "design-system";
 @use "utilities";
 
-$attributes: padding, margin;
+$attributes: padding, margin, gap;
 
 .box {
-  // Padding and Margin
+  // Padding, Margin, and Gap
   @each $attribute in $attributes {
     @each $size in design-system.$sizes-numeric {
       &--#{$attribute}-#{$size} {
@@ -90,6 +90,12 @@ $attributes: padding, margin;
     }
   }
 
+  @each $wrap in design-system.$flex-wrap {
+    &--flex-wrap-#{$wrap} {
+      flex-wrap: $wrap;
+    }
+  }
+
   // Width and Height
   &--width-full {
     width: 100%;
@@ -139,4 +145,11 @@ $attributes: padding, margin;
       text-align: $alignment;
     }
   }
+
+  // background
+  @each $variant, $color in design-system.$color-map {
+    &--background-color-#{$variant} {
+      background-color: $color;
+    }
+  }
 }
diff --git a/ui/components/ui/box/box.stories.js b/ui/components/ui/box/box.stories.js
index 25b17838b..b7168786b 100644
--- a/ui/components/ui/box/box.stories.js
+++ b/ui/components/ui/box/box.stories.js
@@ -75,6 +75,12 @@ export const box = () => {
       )}
       borderWidth={number('borderWidth', 1, sizeKnobOptions, 'border')}
       borderColor={select('borderColor', COLORS, COLORS.BLACK, 'border')}
+      backgroundColor={select(
+        'backgroundColor',
+        COLORS,
+        COLORS.WHITE,
+        'background',
+      )}
     >
       {items}
     </Box>
diff --git a/ui/components/ui/button/README.mdx b/ui/components/ui/button/README.mdx
new file mode 100644
index 000000000..7551beccb
--- /dev/null
+++ b/ui/components/ui/button/README.mdx
@@ -0,0 +1,59 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import Button from '.';
+
+# Button
+
+Buttons communicate actions that users can take.
+
+<Canvas>
+  <Story id="ui-components-ui-button-button-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={Button} />
+
+## Usage
+
+The following describes the props and example usage for this component.
+
+### Type
+
+By changing the `type` prop you can use different styles of the button.
+
+| type              | Description                                                                                           |
+| ----------------- | ----------------------------------------------------------------------------------------------------- |
+| `default`         | default style of the button                                                                           |
+| `primary`         | the principle call to action on the page                                                              |
+| `secondary`       | secondary actions on each page                                                                        |
+| `warning`         | a warning action in the page                                                                          |
+| `danger`          | a negative action (such as Delete) on the page                                                        |
+| `danger--primary` | a negative principle call to action (such as Delete) on the page                                      |
+| `link`            | an optional action or navigation action out of the app changes root html tag from `<button>` to `<a>` |
+
+<Canvas>
+  <Story id="ui-components-ui-button-button-stories-js--types" />
+</Canvas>
+
+### Link Type
+
+By changing the `type` to `"link"` the root html element of the button changes from `<button>` to `<a>`.
+
+Rendered html
+
+```html
+<a class="button btn-link" role="button" tabindex="0">Click me</a>
+```
+
+<Canvas>
+  <Story id="ui-components-ui-button-button-stories-js--link-type" />
+</Canvas>
+
+### With Icon
+
+Pass an icon component to `icon` prop to add an icon.
+
+<Canvas>
+  <Story id="ui-components-ui-button-button-stories-js--with-icon" />
+</Canvas>
diff --git a/ui/components/ui/button/button.stories.js b/ui/components/ui/button/button.stories.js
index ea526c957..05d61ec3c 100644
--- a/ui/components/ui/button/button.stories.js
+++ b/ui/components/ui/button/button.stories.js
@@ -1,69 +1,96 @@
 import React from 'react';
-import { action } from '@storybook/addon-actions';
-import { text, boolean } from '@storybook/addon-knobs';
+
+import BuyIcon from '../icon/overview-buy-icon.component';
+
+import README from './README.mdx';
 import Button from '.';
 
 export default {
   title: 'Button',
   id: __filename,
+  component: Button,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    children: { control: 'text' },
+    disabled: { control: 'boolean' },
+    onClick: { action: 'clicked' },
+    type: {
+      control: {
+        type: 'select',
+      },
+      options: [
+        'default',
+        'primary',
+        'secondary',
+        'warning',
+        'danger',
+        'danger-primary',
+        'link',
+      ],
+    },
+    submit: { control: 'boolean' },
+    large: { control: 'boolean' },
+    className: { control: 'text' },
+    icon: {
+      control: {
+        type: 'select',
+      },
+      options: ['BuyIcon'],
+      mapping: {
+        BuyIcon: <BuyIcon />,
+      },
+    },
+  },
 };
 
-export const primaryType = () => (
-  <Button
-    onClick={action('clicked')}
-    type="primary"
-    disabled={boolean('disabled', false)}
-  >
-    {text('text', 'Click me')}
-  </Button>
+export const DefaultStory = (args) => (
+  <Button {...args}>{args.children}</Button>
 );
 
-export const secondaryType = () => (
-  <Button
-    onClick={action('clicked')}
-    type="secondary"
-    disabled={boolean('disabled', false)}
-  >
-    {text('text', 'Click me')}
-  </Button>
-);
+DefaultStory.storyName = 'Default';
 
-export const defaultType = () => (
-  <Button
-    onClick={action('clicked')}
-    type="default"
-    disabled={boolean('disabled', false)}
-  >
-    {text('text', 'Click me')}
-  </Button>
-);
+DefaultStory.args = {
+  children: 'Default',
+};
 
-export const warningType = () => (
-  <Button
-    onClick={action('clicked')}
-    type="warning"
-    disabled={boolean('disabled', false)}
-  >
-    {text('text', 'Click me')}
-  </Button>
+export const Types = (args) => (
+  <>
+    <Button {...args} type="default">
+      {args.children || 'Default'}
+    </Button>
+    <Button {...args} type="primary">
+      {args.children || 'Primary'}
+    </Button>
+    <Button {...args} type="secondary">
+      {args.children || 'Secondary'}
+    </Button>
+    <Button {...args} type="warning">
+      {args.children || 'Warning'}
+    </Button>
+    <Button {...args} type="danger">
+      {args.children || 'Danger'}
+    </Button>
+    <Button {...args} type="danger-primary">
+      {args.children || 'Danger primary'}
+    </Button>
+    <Button {...args} type="link">
+      {args.children || 'Link'}
+    </Button>
+  </>
 );
 
-export const dangerType = () => (
-  <Button
-    onClick={action('clicked')}
-    type="danger"
-    disabled={boolean('disabled', false)}
-  >
-    {text('text', 'Click me')}
-  </Button>
-);
+export const LinkType = (args) => <Button {...args} type="link" />;
+
+LinkType.args = {
+  children: 'Click me',
+};
 
-export const dangerPrimaryType = () => (
-  <Button
-    onClick={action('clicked')}
-    type="danger-primary"
-    disabled={boolean('disabled', false)}
-  >
-    {text('text', 'Click me')}
+export const WithIcon = (args) => (
+  <Button {...args} type="primary" icon={<BuyIcon />}>
+    {args.children || 'Buy'}
   </Button>
 );
diff --git a/ui/components/ui/chip/chip-with-input.js b/ui/components/ui/chip/chip-with-input.js
index c6fad92d9..8a5e30cc9 100644
--- a/ui/components/ui/chip/chip-with-input.js
+++ b/ui/components/ui/chip/chip-with-input.js
@@ -5,6 +5,7 @@ import { COLORS } from '../../../helpers/constants/design-system';
 import Chip from '.';
 
 export function ChipWithInput({
+  dataTestId,
   className,
   borderColor = COLORS.UI1,
   inputValue,
@@ -17,6 +18,7 @@ export function ChipWithInput({
     >
       {setInputValue && (
         <input
+          data-testid={dataTestId}
           type="text"
           className="chip__input"
           onChange={(e) => {
@@ -30,6 +32,7 @@ export function ChipWithInput({
 }
 
 ChipWithInput.propTypes = {
+  dataTestId: PropTypes.string,
   borderColor: PropTypes.oneOf(Object.values(COLORS)),
   className: PropTypes.string,
   inputValue: PropTypes.string,
diff --git a/ui/components/ui/chip/chip.js b/ui/components/ui/chip/chip.js
index 6311ea72e..45157fd51 100644
--- a/ui/components/ui/chip/chip.js
+++ b/ui/components/ui/chip/chip.js
@@ -6,6 +6,7 @@ import Typography from '../typography';
 import { COLORS, TYPOGRAPHY } from '../../../helpers/constants/design-system';
 
 export default function Chip({
+  dataTestId,
   className,
   children,
   borderColor = COLORS.UI1,
@@ -25,6 +26,7 @@ export default function Chip({
 
   return (
     <div
+      data-testid={dataTestId}
       onClick={onClick}
       onKeyPress={onKeyPress}
       className={classnames(className, 'chip', {
@@ -53,6 +55,7 @@ export default function Chip({
 }
 
 Chip.propTypes = {
+  dataTestId: PropTypes.string,
   borderColor: PropTypes.oneOf(Object.values(COLORS)),
   label: PropTypes.string,
   children: PropTypes.node,
diff --git a/ui/components/ui/currency-input/currency-input.component.js b/ui/components/ui/currency-input/currency-input.component.js
index e953d3090..8c6276f34 100644
--- a/ui/components/ui/currency-input/currency-input.component.js
+++ b/ui/components/ui/currency-input/currency-input.component.js
@@ -69,7 +69,7 @@ export default class CurrencyInput extends PureComponent {
       : getValueFromWeiHex({
           value: hexValue,
           toCurrency: ETH,
-          numberOfDecimals: 6,
+          numberOfDecimals: 8,
         });
 
     return Number(decimalValueString) || 0;
@@ -134,7 +134,7 @@ export default class CurrencyInput extends PureComponent {
     if (this.shouldUseFiat()) {
       // Display ETH
       currency = nativeCurrency || ETH;
-      numberOfDecimals = 6;
+      numberOfDecimals = 8;
     } else {
       // Display Fiat
       currency = currentCurrency;
diff --git a/ui/components/ui/currency-input/currency-input.component.test.js b/ui/components/ui/currency-input/currency-input.component.test.js
index 7092b73dd..840871cb3 100644
--- a/ui/components/ui/currency-input/currency-input.component.test.js
+++ b/ui/components/ui/currency-input/currency-input.component.test.js
@@ -120,7 +120,7 @@ describe('CurrencyInput Component', () => {
       expect(wrapper.find('.unit-input__suffix').text()).toStrictEqual('USD');
       expect(wrapper.find('.unit-input__input').props().value).toStrictEqual(1);
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
-        '0.004328ETH',
+        '0.00432788ETH',
       );
     });
 
@@ -159,14 +159,16 @@ describe('CurrencyInput Component', () => {
         .find(CurrencyInput)
         .at(0)
         .instance();
-      expect(currencyInputInstance.state.decimalValue).toStrictEqual(0.004328);
+      expect(currencyInputInstance.state.decimalValue).toStrictEqual(
+        0.00432788,
+      );
       expect(currencyInputInstance.state.hexValue).toStrictEqual(
         'f602f2234d0ea',
       );
       expect(wrapper.find('.unit-input__suffix')).toHaveLength(1);
       expect(wrapper.find('.unit-input__suffix').text()).toStrictEqual('ETH');
       expect(wrapper.find('.unit-input__input').props().value).toStrictEqual(
-        0.004328,
+        0.00432788,
       );
       expect(
         wrapper.find('.currency-input__conversion-component').text(),
@@ -274,7 +276,7 @@ describe('CurrencyInput Component', () => {
       expect(handleChangeSpy.callCount).toStrictEqual(1);
       expect(handleChangeSpy.calledWith('f602f2234d0ea')).toStrictEqual(true);
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
-        '0.004328ETH',
+        '0.00432788ETH',
       );
       expect(currencyInputInstance.state.decimalValue).toStrictEqual(1);
       expect(currencyInputInstance.state.hexValue).toStrictEqual(
@@ -375,7 +377,7 @@ describe('CurrencyInput Component', () => {
       const swap = wrapper.find('.currency-input__swap-component');
       swap.simulate('click');
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
-        '0.004328ETH',
+        '0.00432788ETH',
       );
     });
   });
diff --git a/ui/components/ui/form-field/form-field.js b/ui/components/ui/form-field/form-field.js
index d735636ac..5cd1fd5b6 100644
--- a/ui/components/ui/form-field/form-field.js
+++ b/ui/components/ui/form-field/form-field.js
@@ -16,6 +16,7 @@ import NumericInput from '../numeric-input/numeric-input.component';
 import InfoTooltip from '../info-tooltip/info-tooltip';
 
 export default function FormField({
+  dataTestId,
   titleText,
   titleUnit,
   tooltipText,
@@ -94,6 +95,7 @@ export default function FormField({
             type={password ? 'password' : 'text'}
             autoFocus={autoFocus}
             disabled={disabled}
+            data-testid={dataTestId}
           />
         )}
         {error && (
@@ -111,13 +113,14 @@ export default function FormField({
 }
 
 FormField.propTypes = {
+  dataTestId: PropTypes.string,
   titleText: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   titleUnit: PropTypes.string,
   tooltipText: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   titleDetail: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   error: PropTypes.string,
   onChange: PropTypes.func,
-  value: PropTypes.number,
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   detailText: PropTypes.string,
   autoFocus: PropTypes.bool,
   numeric: PropTypes.bool,
diff --git a/ui/components/ui/i18n-value/i18n-value.component.js b/ui/components/ui/i18n-value/i18n-value.component.js
new file mode 100644
index 000000000..d321df7e9
--- /dev/null
+++ b/ui/components/ui/i18n-value/i18n-value.component.js
@@ -0,0 +1,15 @@
+import PropTypes from 'prop-types';
+
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+const I18nValue = ({ messageKey, options }) => {
+  const t = useI18nContext();
+  return t(messageKey, options);
+};
+
+I18nValue.propTypes = {
+  messageKey: PropTypes.string.isRequired,
+  options: PropTypes.array,
+};
+
+export default I18nValue;
diff --git a/ui/components/ui/i18n-value/index.js b/ui/components/ui/i18n-value/index.js
new file mode 100644
index 000000000..190d57ab0
--- /dev/null
+++ b/ui/components/ui/i18n-value/index.js
@@ -0,0 +1 @@
+export { default } from './i18n-value.component';
diff --git a/ui/components/ui/metafox-logo/metafox-logo.component.js b/ui/components/ui/metafox-logo/metafox-logo.component.js
index 4a3812dd5..04a626fd0 100644
--- a/ui/components/ui/metafox-logo/metafox-logo.component.js
+++ b/ui/components/ui/metafox-logo/metafox-logo.component.js
@@ -1,23 +1,20 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { getBuildSpecificAsset } from '../../../helpers/utils/build-types';
 
 export default class MetaFoxLogo extends PureComponent {
   static propTypes = {
     onClick: PropTypes.func,
     unsetIconHeight: PropTypes.bool,
-    useDark: PropTypes.bool,
     isOnboarding: PropTypes.bool,
   };
 
   static defaultProps = {
     onClick: undefined,
-    useDark: false,
   };
 
   render() {
-    const { onClick, unsetIconHeight, useDark, isOnboarding } = this.props;
+    const { onClick, unsetIconHeight, isOnboarding } = this.props;
     const iconProps = unsetIconHeight ? {} : { height: 42, width: 42 };
 
     return (
@@ -31,11 +28,7 @@ export default class MetaFoxLogo extends PureComponent {
       >
         <img
           height="30"
-          src={
-            useDark
-              ? getBuildSpecificAsset('metafoxLogoHorizontalDark')
-              : './images/logo/metamask-logo-horizontal.svg'
-          }
+          src="./images/logo/metamask-logo-horizontal.svg"
           className={classnames({
             'app-header__metafox-logo--horizontal': !isOnboarding,
             'onboarding-app-header__metafox-logo--horizontal': isOnboarding,
diff --git a/ui/components/ui/popover/index.scss b/ui/components/ui/popover/index.scss
index 3f48a363c..f048a171c 100644
--- a/ui/components/ui/popover/index.scss
+++ b/ui/components/ui/popover/index.scss
@@ -22,7 +22,7 @@
 
   &-header {
     display: flex;
-    padding: 24px 24px 16px;
+    padding: 24px 16px 16px;
     flex-direction: column;
     background: white;
     position: relative;
diff --git a/ui/components/ui/qr-code/index.scss b/ui/components/ui/qr-code/index.scss
index c228ffeda..03ba8fc08 100644
--- a/ui/components/ui/qr-code/index.scss
+++ b/ui/components/ui/qr-code/index.scss
@@ -25,10 +25,41 @@
     margin-bottom: 9px;
   }
 
+  &__address-container {
+    display: flex;
+    justify-content: center;
+
+    &__tooltip-wrapper {
+      width: 100%;
+    }
+
+    &:hover {
+      cursor: pointer;
+
+      .qr-code__copy-icon__svg {
+        fill: $primary-1;
+      }
+    }
+  }
+
   &__address {
     @include H7;
 
-    background-color: $ui-1;
-    padding: 12px;
+    background-color: $Grey-000;
+    width: 76%;
+    padding: 8px 12px;
+    word-break: break-all;
+    text-align: center;
+  }
+
+  &__copy-icon {
+    height: 13px;
+    padding: 17px 0;
+    position: absolute;
+    right: 24px;
+
+    &__svg {
+      fill: $ui-5;
+    }
   }
 }
diff --git a/ui/components/ui/qr-code/qr-code.js b/ui/components/ui/qr-code/qr-code.js
index 89ce505ab..69921e260 100644
--- a/ui/components/ui/qr-code/qr-code.js
+++ b/ui/components/ui/qr-code/qr-code.js
@@ -3,7 +3,11 @@ import React from 'react';
 import qrCode from 'qrcode-generator';
 import { connect } from 'react-redux';
 import { isHexPrefixed } from 'ethereumjs-util';
+import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
+import Tooltip from '../tooltip';
+import CopyIcon from '../icon/copy-icon.component';
+import { useI18nContext } from '../../../hooks/useI18nContext';
 
 export default connect(mapStateToProps)(QrCodeView);
 
@@ -22,6 +26,8 @@ function QrCodeView(props) {
   const address = `${
     isHexPrefixed(data) ? 'ethereum:' : ''
   }${toChecksumHexAddress(data)}`;
+  const [copied, handleCopy] = useCopyToClipboard();
+  const t = useI18nContext();
   const qrImage = qrCode(4, 'M');
   qrImage.addData(address);
   qrImage.make();
@@ -50,7 +56,23 @@ function QrCodeView(props) {
           __html: qrImage.createTableTag(4),
         }}
       />
-      <div className="qr-code__address">{toChecksumHexAddress(data)}</div>
+      <Tooltip
+        wrapperClassName="qr-code__address-container__tooltip-wrapper"
+        position="bottom"
+        title={copied ? t('copiedExclamation') : t('copyToClipboard')}
+      >
+        <div
+          className="qr-code__address-container"
+          onClick={() => {
+            handleCopy(toChecksumHexAddress(data));
+          }}
+        >
+          <div className="qr-code__address">{toChecksumHexAddress(data)}</div>
+          <div className="qr-code__copy-icon">
+            <CopyIcon size={11} className="qr-code__copy-icon__svg" color="" />
+          </div>
+        </div>
+      </Tooltip>
     </div>
   );
 }
diff --git a/ui/components/ui/radio-group/radio-group.stories.js b/ui/components/ui/radio-group/radio-group.stories.js
index d14435301..c614e7bad 100644
--- a/ui/components/ui/radio-group/radio-group.stories.js
+++ b/ui/components/ui/radio-group/radio-group.stories.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { GAS_RECOMMENDATIONS } from '../../../../shared/constants/gas';
 import RadioGroup from '.';
 
 export default {
@@ -12,11 +13,15 @@ export const radioGroup = () => {
       <RadioGroup
         name="gas-recommendation"
         options={[
-          { value: 'low', label: 'Low', recommended: false },
-          { value: 'medium', label: 'Medium', recommended: false },
-          { value: 'high', label: 'High', recommended: true },
+          { value: GAS_RECOMMENDATIONS.LOW, label: 'Low', recommended: false },
+          {
+            value: GAS_RECOMMENDATIONS.MEDIUM,
+            label: 'Medium',
+            recommended: false,
+          },
+          { value: GAS_RECOMMENDATIONS.HIGH, label: 'High', recommended: true },
         ]}
-        selectedValue="high"
+        selectedValue={GAS_RECOMMENDATIONS.HIGH}
       />
     </div>
   );
diff --git a/ui/components/ui/sender-to-recipient/index.scss b/ui/components/ui/sender-to-recipient/index.scss
index edd50cd4a..450212939 100644
--- a/ui/components/ui/sender-to-recipient/index.scss
+++ b/ui/components/ui/sender-to-recipient/index.scss
@@ -7,7 +7,6 @@
   flex: 0 0 auto;
 
   &--default {
-    border-bottom: 1px solid $geyser;
     height: 42px;
 
     .sender-to-recipient {
@@ -28,6 +27,7 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        border: 1px solid #d8d8d8;
 
         &--sender {
           padding-right: 30px;
@@ -51,7 +51,7 @@
         align-items: center;
         justify-content: center;
 
-        [dir='rtl'] & {
+        [dir="rtl"] & {
           transform: rotate(180deg);
         }
       }
@@ -69,14 +69,14 @@
       }
 
       &__name {
-        @include H6;
+        @include H7;
 
         padding-left: 14px;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
 
-        [dir='rtl'] & {
+        [dir="rtl"] & {
           /*rtl:ignore*/
           direction: ltr;
 
@@ -109,6 +109,7 @@
         cursor: pointer;
         min-width: 0;
         color: $dusty-gray;
+        border: 1px solid #d8d8d8;
       }
 
       &__tooltip-wrapper {
@@ -124,7 +125,7 @@
         text-overflow: ellipsis;
         white-space: nowrap;
 
-        [dir='rtl'] & {
+        [dir="rtl"] & {
           /*rtl:ignore*/
           direction: ltr;
 
@@ -145,7 +146,7 @@
         justify-content: center;
         align-items: center;
 
-        [dir='rtl'] & {
+        [dir="rtl"] & {
           transform: rotate(180deg);
         }
       }
@@ -164,6 +165,7 @@
         cursor: pointer;
         min-width: 0;
         color: $dusty-gray;
+        border: 1px solid #d8d8d8;
       }
 
       &__tooltip-wrapper {
@@ -180,7 +182,7 @@
         white-space: nowrap;
         margin-inline-start: 8px;
 
-        [dir='rtl'] & {
+        [dir="rtl"] & {
           /*rtl:ignore*/
           direction: ltr;
 
@@ -201,7 +203,7 @@
         justify-content: center;
         align-items: center;
 
-        [dir='rtl'] & {
+        [dir="rtl"] & {
           transform: rotate(180deg);
         }
       }
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 fe6655cc8..4f92a3016 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
@@ -71,9 +71,7 @@ function SenderAddress({
         <div className="sender-to-recipient__name">
           {addressOnly ? (
             <span>
-              {`${t('from')}: ${
-                senderName || shortenAddress(checksummedSenderAddress)
-              }`}
+              {`${senderName || shortenAddress(checksummedSenderAddress)}`}
             </span>
           ) : (
             senderName
@@ -144,7 +142,6 @@ function RecipientWithAddress({
         onHidden={() => setAddressCopied(false)}
       >
         <div className="sender-to-recipient__name">
-          <span>{addressOnly ? `${t('to')}: ` : ''}</span>
           {addressOnly
             ? recipientNickname ||
               recipientEns ||
diff --git a/ui/components/ui/tabs/tabs.component.js b/ui/components/ui/tabs/tabs.component.js
index 6c091e5a2..c0f9dc923 100644
--- a/ui/components/ui/tabs/tabs.component.js
+++ b/ui/components/ui/tabs/tabs.component.js
@@ -42,9 +42,9 @@ export default class Tabs extends Component {
   }
 
   renderTabs() {
-    const numberOfTabs = React.Children.count(this.props.children);
+    const numberOfTabs = React.Children.count(this._getValidChildren());
 
-    return React.Children.map(this.props.children, (child, index) => {
+    return React.Children.map(this._getValidChildren(), (child, index) => {
       const tabName = child?.props.name;
       return (
         child &&
@@ -58,7 +58,7 @@ export default class Tabs extends Component {
   }
 
   renderActiveTabContent() {
-    const { children } = this.props;
+    const children = this._getValidChildren();
     const { activeTabIndex } = this.state;
 
     if (
@@ -92,8 +92,12 @@ export default class Tabs extends Component {
    * @private
    */
   _findChildByName(name) {
-    return React.Children.toArray(this.props.children).findIndex(
-      (c) => c?.props.name === name,
-    );
+    return this._getValidChildren().findIndex((c) => c?.props.name === name);
+  }
+
+  // This ignores any 'null' child elements that are a result of a conditional
+  // based on a feature flag setting.
+  _getValidChildren() {
+    return React.Children.toArray(this.props.children).filter(Boolean);
   }
 }
diff --git a/ui/components/ui/toggle-button/toggle-button.stories.js b/ui/components/ui/toggle-button/toggle-button.stories.js
index 64f1a7acb..dd1e31c52 100644
--- a/ui/components/ui/toggle-button/toggle-button.stories.js
+++ b/ui/components/ui/toggle-button/toggle-button.stories.js
@@ -27,6 +27,4 @@ export const DefaultStory = () => {
   );
 };
 
-DefaultStory.story = {
-  name: 'Default',
-};
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/token-input/token-input.component.js b/ui/components/ui/token-input/token-input.component.js
index 60665ac20..763bc5824 100644
--- a/ui/components/ui/token-input/token-input.component.js
+++ b/ui/components/ui/token-input/token-input.component.js
@@ -75,11 +75,12 @@ export default class TokenInput extends PureComponent {
     return Number(decimalValueString) ? decimalValueString : '';
   }
 
-  handleChange = (decimalValue) => {
+  handleChange = (decimalValue, applyDecimals = false) => {
     const { token: { decimals } = {}, onChange } = this.props;
 
     let newDecimalValue = decimalValue;
-    if (decimals) {
+
+    if (decimals && applyDecimals) {
       newDecimalValue = parseFloat(decimalValue).toFixed(decimals);
     }
 
@@ -94,6 +95,10 @@ export default class TokenInput extends PureComponent {
     onChange(hexValue);
   };
 
+  handleBlur = (decimalValue) => {
+    this.handleChange(decimalValue, true);
+  };
+
   renderConversionComponent() {
     const {
       tokenExchangeRates,
@@ -155,6 +160,7 @@ export default class TokenInput extends PureComponent {
         {...restProps}
         suffix={token.symbol}
         onChange={this.handleChange}
+        onBlur={this.handleBlur}
         value={decimalValue}
       >
         {this.renderConversionComponent()}
diff --git a/ui/components/ui/tooltip/tooltip.js b/ui/components/ui/tooltip/tooltip.js
index 19d244737..84afe57ed 100644
--- a/ui/components/ui/tooltip/tooltip.js
+++ b/ui/components/ui/tooltip/tooltip.js
@@ -80,7 +80,7 @@ export default class Tooltip extends PureComponent {
         size={size}
         offset={offset}
         style={style}
-        title={title}
+        title={disabled ? '' : title}
         trigger={trigger}
         theme={theme}
         tabIndex={tabIndex || 0}
diff --git a/ui/components/ui/typography/typography.js b/ui/components/ui/typography/typography.js
index 02f9a3015..0af48e699 100644
--- a/ui/components/ui/typography/typography.js
+++ b/ui/components/ui/typography/typography.js
@@ -20,6 +20,7 @@ export default function Typography({
   children,
   fontWeight = 'normal',
   fontStyle = 'normal',
+  fontSize,
   align,
   boxProps = {},
   margin = [1, 0],
@@ -33,6 +34,7 @@ export default function Typography({
     {
       [`typography--align-${align}`]: Boolean(align),
       [`typography--color-${color}`]: Boolean(color),
+      [`typography--size-${fontSize}`]: Boolean(fontSize),
     },
   );
 
@@ -67,6 +69,7 @@ Typography.propTypes = {
   margin: MultipleSizes,
   fontWeight: PropTypes.oneOf(Object.values(FONT_WEIGHT)),
   fontStyle: PropTypes.oneOf(Object.values(FONT_STYLE)),
+  fontSize: PropTypes.string,
   tag: PropTypes.oneOf([
     'p',
     'h1',
diff --git a/ui/components/ui/typography/typography.scss b/ui/components/ui/typography/typography.scss
index 612bfc1cc..c92fc6eb2 100644
--- a/ui/components/ui/typography/typography.scss
+++ b/ui/components/ui/typography/typography.scss
@@ -32,6 +32,12 @@
     }
   }
 
+  @each $size in design-system.$font-size {
+    &--size-#{$size} {
+      font-size: $size;
+    }
+  }
+
   @each $alignment in design-system.$text-align {
     &--align-#{$alignment} {
       text-align: $alignment;
diff --git a/ui/components/ui/unit-input/unit-input.component.js b/ui/components/ui/unit-input/unit-input.component.js
index 8802519fb..10e14b12f 100644
--- a/ui/components/ui/unit-input/unit-input.component.js
+++ b/ui/components/ui/unit-input/unit-input.component.js
@@ -17,6 +17,7 @@ export default class UnitInput extends PureComponent {
     actionComponent: PropTypes.node,
     error: PropTypes.bool,
     onChange: PropTypes.func,
+    onBlur: PropTypes.func,
     placeholder: PropTypes.string,
     suffix: PropTypes.string,
     value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -55,6 +56,8 @@ export default class UnitInput extends PureComponent {
     if (value === '') {
       this.setState({ value: '0' });
     }
+
+    this.props.onBlur && this.props.onBlur(value);
   };
 
   handleChange = (event) => {
diff --git a/ui/contexts/gasFee.js b/ui/contexts/gasFee.js
new file mode 100644
index 000000000..c7fe7f092
--- /dev/null
+++ b/ui/contexts/gasFee.js
@@ -0,0 +1,37 @@
+import React, { createContext, useContext } from 'react';
+import PropTypes from 'prop-types';
+import { useGasFeeInputs } from '../hooks/gasFeeInput/useGasFeeInputs';
+
+export const GasFeeContext = createContext({});
+
+export const GasFeeContextProvider = ({
+  children,
+  defaultEstimateToUse,
+  transaction,
+  minimumGasLimit,
+  editGasMode,
+}) => {
+  const gasFeeDetails = useGasFeeInputs(
+    defaultEstimateToUse,
+    transaction,
+    minimumGasLimit,
+    editGasMode,
+  );
+  return (
+    <GasFeeContext.Provider value={gasFeeDetails}>
+      {children}
+    </GasFeeContext.Provider>
+  );
+};
+
+export function useGasFeeContext() {
+  return useContext(GasFeeContext);
+}
+
+GasFeeContextProvider.propTypes = {
+  children: PropTypes.node.isRequired,
+  defaultEstimateToUse: PropTypes.string,
+  transaction: PropTypes.object.isRequired,
+  minimumGasLimit: PropTypes.string,
+  editGasMode: PropTypes.string,
+};
diff --git a/ui/css/design-system/attributes.scss b/ui/css/design-system/attributes.scss
index 7373c7c3b..8b920b7eb 100644
--- a/ui/css/design-system/attributes.scss
+++ b/ui/css/design-system/attributes.scss
@@ -19,6 +19,11 @@ $flex-direction:
   column,
   column-reverse;
 
+$flex-wrap:
+  wrap,
+  wrap-reverse,
+  nowrap;
+
 $fractions: (
   1\/2: 50%,
   1\/3: 33.333333%,
@@ -77,3 +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;
diff --git a/ui/css/design-system/colors.scss b/ui/css/design-system/colors.scss
index b447315f8..d76de5ef6 100644
--- a/ui/css/design-system/colors.scss
+++ b/ui/css/design-system/colors.scss
@@ -97,25 +97,30 @@ $success-2: #caf4d1;
 $success-3: #219e37;
 
 $ui-black: #24292e;
+$ui-grey: #d6d9dc;
 $ui-white: #fff;
 $ui-1: #f2f3f4;
 $ui-2: #d6d9dc;
 $ui-3: #bbc0c5;
 $ui-4: #6a737d;
+$ui-5: #c4c4c4;
 
 $mainnet: #29b6af;
 $ropsten: #ff4a8d;
 $kovan: #9064ff;
 $rinkeby: #f6c343;
 $goerli: #3099f2;
+$localhost: #29b6af;
 
 $color-map: (
   'ui-1': $ui-1,
   'ui-2': $ui-2,
   'ui-3': $ui-3,
   'ui-4': $ui-4,
+  'ui-5': $ui-5,
   'white': $ui-white,
   'black': $ui-black,
+  'grey': $ui-grey,
   'primary-1': $primary-1,
   'primary-2': $primary-2,
   'primary-3': $primary-3,
@@ -136,5 +141,6 @@ $color-map: (
   'kovan': $kovan,
   'rinkeby': $rinkeby,
   'goerli': $goerli,
+  'localhost': $localhost,
   'transparent': transparent,
 );
diff --git a/ui/css/itcss/components/network.scss b/ui/css/itcss/components/network.scss
index 31137ac43..f7355fc1b 100644
--- a/ui/css/itcss/components/network.scss
+++ b/ui/css/itcss/components/network.scss
@@ -32,6 +32,10 @@
   &.goerli-test-network .menu-icon-circle div {
     background-color: rgba(48, 153, 242, 0.7) !important;
   }
+
+  &.localhost-network .menu-icon-circle div {
+    background-color: rgba(3, 135, 137, 0.7) !important;
+  }
 }
 
 .dropdown-menu-item {
@@ -131,6 +135,12 @@
   background-color: $scorpion;
 }
 
+.network-dropdown-testnets {
+  &--no-visibility {
+    visibility: hidden;
+  }
+}
+
 .network-dropdown-title {
   @include H4;
 
@@ -146,6 +156,25 @@
   min-height: 36px;
   width: 265px;
   color: $dusty-gray;
+
+  &--link {
+    color: $white;
+    cursor: pointer;
+    font-weight: bold;
+    text-decoration: underline;
+
+    &:hover {
+      color: $white;
+    }
+  }
+
+  &--close {
+    color: $white;
+    background: inherit;
+    position: absolute;
+    top: 64px;
+    right: 10px;
+  }
 }
 
 .network-caret {
diff --git a/ui/ducks/app/app.js b/ui/ducks/app/app.js
index f9ea58daa..e7b4c2c9f 100644
--- a/ui/ducks/app/app.js
+++ b/ui/ducks/app/app.js
@@ -38,9 +38,9 @@ export default function reduceApp(state = {}, action) {
     defaultHdPaths: {
       trezor: `m/44'/60'/0'/0`,
       ledger: `m/44'/60'/0'/0/0`,
+      lattice: `m/44'/60'/0'/0`,
     },
     networksTabSelectedRpcUrl: '',
-    networksTabIsInAddMode: false,
     loadingMethodData: false,
     show3BoxModalAfterImport: false,
     threeBoxLastUpdated: null,
@@ -54,6 +54,8 @@ export default function reduceApp(state = {}, action) {
     gasLoadingAnimationIsShowing: false,
     ledgerWebHidConnectedStatus: WEBHID_CONNECTED_STATUSES.UNKNOWN,
     ledgerTransportStatus: TRANSPORT_STATES.NONE,
+    newNetworkAdded: '',
+    showTestnetMessageInDropdown: true,
     ...state,
   };
 
@@ -71,6 +73,12 @@ export default function reduceApp(state = {}, action) {
         networkDropdownOpen: false,
       };
 
+    case actionConstants.HIDE_TESTNET_MESSAGE:
+      return {
+        ...appState,
+        showTestnetMessageInDropdown: false,
+      };
+
     // alert methods
     case actionConstants.ALERT_OPEN:
       return {
@@ -283,10 +291,10 @@ export default function reduceApp(state = {}, action) {
         networksTabSelectedRpcUrl: action.value,
       };
 
-    case actionConstants.SET_NETWORKS_TAB_ADD_MODE:
+    case actionConstants.SET_NEW_NETWORK_ADDED:
       return {
         ...appState,
-        networksTabIsInAddMode: action.value,
+        newNetworkAdded: action.value,
       };
 
     case actionConstants.LOADING_METHOD_DATA_STARTED:
diff --git a/ui/ducks/app/app.test.js b/ui/ducks/app/app.test.js
index e88ac1b9b..2ad0222d5 100644
--- a/ui/ducks/app/app.test.js
+++ b/ui/ducks/app/app.test.js
@@ -38,6 +38,16 @@ describe('App State', () => {
     expect(newState.networkDropdownOpen).toStrictEqual(false);
   });
 
+  it('sets showTestnetMessageInDropdown dropdown to false', () => {
+    const testnetMessage = { showTestnetMessageInDropdown: true };
+    const state = { ...metamaskState, ...testnetMessage };
+    const newState = reduceApp(state, {
+      type: actions.HIDE_TESTNET_MESSAGE,
+    });
+
+    expect(newState.showTestnetMessageInDropdown).toStrictEqual(false);
+  });
+
   it('opens alert', () => {
     const state = reduceApp(metamaskState, {
       type: actions.ALERT_OPEN,
@@ -255,6 +265,7 @@ describe('App State', () => {
     const hdPaths = {
       trezor: "m/44'/60'/0'/0",
       ledger: "m/44'/60'/0'",
+      lattice: "m/44'/60'/0'/0",
     };
     const state = reduceApp(metamaskState, {
       type: actions.SET_HARDWARE_WALLET_DEFAULT_HD_PATH,
diff --git a/ui/ducks/metamask/metamask.js b/ui/ducks/metamask/metamask.js
index 452acbd60..9578826e1 100644
--- a/ui/ducks/metamask/metamask.js
+++ b/ui/ducks/metamask/metamask.js
@@ -34,6 +34,7 @@ export default function reduceMetamask(state = {}, action) {
     preferences: {
       autoLockTimeLimit: undefined,
       showFiatInTestnets: false,
+      showTestNetworks: false,
       useNativeCurrencyAsPrimaryCurrency: true,
     },
     firstTimeFlowType: null,
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 86f385747..690092173 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -40,6 +40,7 @@ import {
   checkNetworkAndAccountSupports1559,
   getUseTokenDetection,
   getTokenList,
+  getAddressBookEntryOrAccountName,
 } from '../../selectors';
 import {
   disconnectGasFeeEstimatePoller,
@@ -1444,12 +1445,12 @@ export function useMyAccountsForRecipientSearch() {
 export function updateRecipient({ address, nickname }) {
   return async (dispatch, getState) => {
     const state = getState();
-    const nicknameFromAddressBook =
-      getAddressBookEntry(state, address)?.name ?? '';
+    const nicknameFromAddressBookEntryOrAccountName =
+      getAddressBookEntryOrAccountName(state, address) ?? '';
     await dispatch(
       actions.updateRecipient({
         address,
-        nickname: nickname || nicknameFromAddressBook,
+        nickname: nickname || nicknameFromAddressBookEntryOrAccountName,
       }),
     );
     await dispatch(computeEstimatedGasLimit());
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index 9e272b9b3..aa7f7e25c 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -1626,6 +1626,7 @@ describe('Send Slice', () => {
         const updateRecipientState = {
           metamask: {
             addressBook: {},
+            identities: {},
             provider: {
               chainId: '0x1',
             },
@@ -1740,6 +1741,7 @@ describe('Send Slice', () => {
         const tokenState = {
           metamask: {
             addressBook: {},
+            identities: {},
             blockGasLimit: '',
             selectedAddress: '',
             provider: {
@@ -1794,6 +1796,7 @@ describe('Send Slice', () => {
         const updateRecipientState = {
           metamask: {
             addressBook: {},
+            identities: {},
             provider: {
               chainId: '',
             },
diff --git a/ui/helpers/constants/design-system.js b/ui/helpers/constants/design-system.js
index 2f3b4bdd9..ae26f9d28 100644
--- a/ui/helpers/constants/design-system.js
+++ b/ui/helpers/constants/design-system.js
@@ -10,7 +10,7 @@ export const COLORS = {
   UI3: 'ui-3',
   UI4: 'ui-4',
   BLACK: 'black',
-  GRAY: 'gray',
+  GREY: 'grey',
   WHITE: 'white',
   PRIMARY1: 'primary-1',
   PRIMARY2: 'primary-2',
@@ -33,6 +33,7 @@ export const COLORS = {
   RINKEBY: 'rinkeby',
   GOERLI: 'goerli',
   TRANSPARENT: 'transparent',
+  LOCALHOST: 'localhost',
 };
 
 export const TYPOGRAPHY = {
@@ -95,6 +96,12 @@ export const FLEX_DIRECTION = {
   COLUMN_REVERSE: 'column-reverse',
 };
 
+export const FLEX_WRAP = {
+  WRAP: 'wrap',
+  WRAP_REVERSE: 'wrap-reverse',
+  NO_WRAP: 'nowrap',
+};
+
 export const DISPLAY = {
   BLOCK: 'block',
   FLEX: 'flex',
diff --git a/ui/helpers/constants/error-keys.js b/ui/helpers/constants/error-keys.js
index e51b87736..8372a3f1e 100644
--- a/ui/helpers/constants/error-keys.js
+++ b/ui/helpers/constants/error-keys.js
@@ -6,3 +6,4 @@ export const ETH_GAS_PRICE_FETCH_WARNING_KEY = 'ethGasPriceFetchWarning';
 export const GAS_PRICE_FETCH_FAILURE_ERROR_KEY = 'gasPriceFetchFailed';
 export const GAS_PRICE_EXCESSIVE_ERROR_KEY = 'gasPriceExcessive';
 export const UNSENDABLE_ASSET_ERROR_KEY = 'unsendableAsset';
+export const INSUFFICIENT_FUNDS_FOR_GAS_ERROR_KEY = 'insufficientFundsForGas';
diff --git a/ui/helpers/constants/routes.js b/ui/helpers/constants/routes.js
index 8b10ea77a..7883647de 100644
--- a/ui/helpers/constants/routes.js
+++ b/ui/helpers/constants/routes.js
@@ -11,6 +11,7 @@ const ABOUT_US_ROUTE = '/settings/about-us';
 const ALERTS_ROUTE = '/settings/alerts';
 const NETWORKS_ROUTE = '/settings/networks';
 const NETWORKS_FORM_ROUTE = '/settings/networks/form';
+const ADD_NETWORK_ROUTE = '/settings/networks/add-network';
 const CONTACT_LIST_ROUTE = '/settings/contact-list';
 const CONTACT_EDIT_ROUTE = '/settings/contact-list/edit-contact';
 const CONTACT_ADD_ROUTE = '/settings/contact-list/add-contact';
@@ -96,6 +97,7 @@ const PATH_NAME_MAP = {
   [ALERTS_ROUTE]: 'Alerts Settings Page',
   [NETWORKS_ROUTE]: 'Network Settings Page',
   [NETWORKS_FORM_ROUTE]: 'Network Settings Page Form',
+  [ADD_NETWORK_ROUTE]: 'Add Network From Settings Page Form',
   [CONTACT_LIST_ROUTE]: 'Contact List Settings Page',
   [`${CONTACT_EDIT_ROUTE}/:address`]: 'Edit Contact Settings Page',
   [CONTACT_ADD_ROUTE]: 'Add Contact Settings Page',
@@ -200,6 +202,7 @@ export {
   CONTACT_VIEW_ROUTE,
   NETWORKS_ROUTE,
   NETWORKS_FORM_ROUTE,
+  ADD_NETWORK_ROUTE,
   INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
   INITIALIZE_SEED_PHRASE_INTRO_ROUTE,
   CONNECT_ROUTE,
diff --git a/ui/helpers/constants/transactions.js b/ui/helpers/constants/transactions.js
index 614f0329d..aeeda8bdf 100644
--- a/ui/helpers/constants/transactions.js
+++ b/ui/helpers/constants/transactions.js
@@ -19,3 +19,8 @@ export const TOKEN_CATEGORY_HASH = {
   [TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER]: true,
   [TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM]: true,
 };
+
+export const TRANSACTION_ENVELOPE_TYPE_NAMES = {
+  FEE_MARKET: 'fee-market',
+  LEGACY: 'legacy',
+};
diff --git a/ui/helpers/utils/build-types.js b/ui/helpers/utils/build-types.js
index 37b4c139d..8577b3905 100644
--- a/ui/helpers/utils/build-types.js
+++ b/ui/helpers/utils/build-types.js
@@ -1,15 +1,25 @@
-import betaJson from '../../../app/build-types/beta/beta-mascot.json';
+///: BEGIN:ONLY_INCLUDE_IN(beta)
+import betaJson from '../../../app/build-types/beta/images/beta-mascot.json';
+///: END:ONLY_INCLUDE_IN
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import flaskJson from '../../../app/build-types/flask/images/flask-mascot.json';
+///: END:ONLY_INCLUDE_IN
 
 const assetList = {
   main: {
-    metafoxLogoHorizontalDark: '/images/logo/metamask-logo-horizontal.svg',
     // Will use default provided by the @metamask/logo library
     foxMeshJson: undefined,
   },
+  ///: BEGIN:ONLY_INCLUDE_IN(beta)
   beta: {
-    metafoxLogoHorizontalDark: '/images/logo/metamask-logo-horizontal-dark.svg',
     foxMeshJson: betaJson,
   },
+  ///: END:ONLY_INCLUDE_IN
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  flask: {
+    foxMeshJson: flaskJson,
+  },
+  ///: END:ONLY_INCLUDE_IN
 };
 
 export function isBeta() {
@@ -24,8 +34,8 @@ export function getBuildSpecificAsset(assetName) {
     !assetList[buildType] ||
     !Object.keys(assetList[buildType]).includes(assetName)
   ) {
-    console.warn(
-      `Cannot find asset for build ${buildType}: ${assetName}, returning main build asset`,
+    console.error(
+      `Cannot find asset "${assetName}" for build "${buildType}", returning main build asset.`,
     );
     return assetList.main[assetName];
   }
diff --git a/ui/helpers/utils/hardware.js b/ui/helpers/utils/hardware.js
new file mode 100644
index 000000000..b011f7879
--- /dev/null
+++ b/ui/helpers/utils/hardware.js
@@ -0,0 +1,3 @@
+export function isHardwareKeyring(keyringType = '') {
+  return keyringType.includes('Hardware');
+}
diff --git a/ui/helpers/utils/transactions.util.js b/ui/helpers/utils/transactions.util.js
index 17a27c81a..0613159bc 100644
--- a/ui/helpers/utils/transactions.util.js
+++ b/ui/helpers/utils/transactions.util.js
@@ -145,7 +145,7 @@ export function getLatestSubmittedTxWithNonce(
 }
 
 export async function isSmartContractAddress(address) {
-  const { isContractCode } = readAddressAsContract(global.eth, address);
+  const { isContractCode } = await readAddressAsContract(global.eth, address);
   return isContractCode;
 }
 
diff --git a/ui/hooks/gasFeeInput/useGasFeeErrors.js b/ui/hooks/gasFeeInput/useGasFeeErrors.js
index d477087d0..0300feec0 100644
--- a/ui/hooks/gasFeeInput/useGasFeeErrors.js
+++ b/ui/hooks/gasFeeInput/useGasFeeErrors.js
@@ -130,7 +130,10 @@ const getMaxFeeWarning = (
   return undefined;
 };
 
-const getBalanceError = (minimumCostInHexWei, transaction, ethBalance) => {
+const hasBalanceError = (minimumCostInHexWei, transaction, ethBalance) => {
+  if (minimumCostInHexWei === undefined || ethBalance === undefined) {
+    return false;
+  }
   const minimumTxCostInHexWei = addHexes(
     minimumCostInHexWei,
     transaction?.txParams?.value || '0x0',
@@ -247,7 +250,7 @@ export function useGasFeeErrors({
   );
 
   const { balance: ethBalance } = useSelector(getSelectedAccount);
-  const balanceError = getBalanceError(
+  const balanceError = hasBalanceError(
     minimumCostInHexWei,
     transaction,
     ethBalance,
diff --git a/ui/hooks/gasFeeInput/useGasFeeInputs.js b/ui/hooks/gasFeeInput/useGasFeeInputs.js
index 25f6d5c76..51021cc42 100644
--- a/ui/hooks/gasFeeInput/useGasFeeInputs.js
+++ b/ui/hooks/gasFeeInput/useGasFeeInputs.js
@@ -1,9 +1,19 @@
 import { useCallback, useState } from 'react';
 import { useSelector } from 'react-redux';
 
-import { getAdvancedInlineGasShown } from '../../selectors';
-import { hexToDecimal } from '../../helpers/utils/conversions.util';
+import {
+  CUSTOM_GAS_ESTIMATE,
+  GAS_RECOMMENDATIONS,
+  EDIT_GAS_MODES,
+} from '../../../shared/constants/gas';
 import { GAS_FORM_ERRORS } from '../../helpers/constants/gas';
+import { areDappSuggestedAndTxParamGasFeesTheSame } from '../../helpers/utils/confirm-tx.util';
+import {
+  checkNetworkAndAccountSupports1559,
+  getAdvancedInlineGasShown,
+} from '../../selectors';
+import { hexToDecimal } from '../../helpers/utils/conversions.util';
+import { isLegacyTransaction } from '../../helpers/utils/transactions.util';
 import { useGasFeeEstimates } from '../useGasFeeEstimates';
 
 import { useGasFeeErrors } from './useGasFeeErrors';
@@ -58,11 +68,15 @@ import { useGasEstimates } from './useGasEstimates';
  * ).GasEstimates} - gas fee input state and the GasFeeEstimates object
  */
 export function useGasFeeInputs(
-  defaultEstimateToUse = 'medium',
+  defaultEstimateToUse = GAS_RECOMMENDATIONS.MEDIUM,
   transaction,
   minimumGasLimit = '0x5208',
-  editGasMode,
+  editGasMode = EDIT_GAS_MODES.MODIFY_IN_PLACE,
 ) {
+  const supportsEIP1559 =
+    useSelector(checkNetworkAndAccountSupports1559) &&
+    !isLegacyTransaction(transaction?.txParams);
+
   // We need the gas estimates from the GasFeeController in the background.
   // Calling this hooks initiates polling for new gas estimates and returns the
   // current estimate.
@@ -86,6 +100,13 @@ export function useGasFeeInputs(
     return defaultEstimateToUse;
   });
 
+  const [
+    isUsingDappSuggestedGasFees,
+    setIsUsingDappSuggestedGasFees,
+  ] = useState(() =>
+    Boolean(areDappSuggestedAndTxParamGasFeesTheSame(transaction)),
+  );
+
   const [gasLimit, setGasLimit] = useState(
     Number(hexToDecimal(transaction?.txParams?.gas ?? '0x0')),
   );
@@ -187,6 +208,7 @@ export function useGasFeeInputs(
       setMaxPriorityFeePerGas(null);
       setGasPrice(null);
       setGasPriceHasBeenManuallySet(false);
+      setIsUsingDappSuggestedGasFees(false);
     },
     [
       setInternalEstimateToUse,
@@ -195,11 +217,12 @@ export function useGasFeeInputs(
       setMaxPriorityFeePerGas,
       setGasPrice,
       setGasPriceHasBeenManuallySet,
+      setIsUsingDappSuggestedGasFees,
     ],
   );
 
   const onManualChange = useCallback(() => {
-    setInternalEstimateToUse('custom');
+    setInternalEstimateToUse(CUSTOM_GAS_ESTIMATE);
     handleGasLimitOutOfBoundError();
     // Restore existing values
     setGasPrice(gasPrice);
@@ -222,6 +245,7 @@ export function useGasFeeInputs(
   ]);
 
   return {
+    transaction,
     maxFeePerGas,
     maxFeePerGasFiat,
     setMaxFeePerGas,
@@ -239,6 +263,7 @@ export function useGasFeeInputs(
     estimatedMaximumNative,
     estimatedMinimumNative,
     isGasEstimatesLoading,
+    isUsingDappSuggestedGasFees,
     gasFeeEstimates,
     gasEstimateType,
     estimatedGasFeeTimeBounds,
@@ -250,5 +275,6 @@ export function useGasFeeInputs(
     gasErrors,
     gasWarnings,
     hasGasErrors,
+    supportsEIP1559,
   };
 }
diff --git a/ui/hooks/gasFeeInput/useGasFeeInputs.test.js b/ui/hooks/gasFeeInput/useGasFeeInputs.test.js
index 277812185..5127c61b7 100644
--- a/ui/hooks/gasFeeInput/useGasFeeInputs.test.js
+++ b/ui/hooks/gasFeeInput/useGasFeeInputs.test.js
@@ -1,6 +1,10 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useSelector } from 'react-redux';
 import { TRANSACTION_ENVELOPE_TYPES } from '../../../shared/constants/transaction';
+import {
+  GAS_RECOMMENDATIONS,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../../shared/constants/gas';
 
 import { ETH, PRIMARY } from '../../helpers/constants/common';
 
@@ -116,7 +120,7 @@ describe('useGasFeeInputs', () => {
 
     it('returns gasPrice appropriately, and "0" for EIP1559 fields', () => {
       const { result } = renderHook(() =>
-        useGasFeeInputs('medium', {
+        useGasFeeInputs(GAS_RECOMMENDATIONS.MEDIUM, {
           txParams: {
             value: '3782DACE9D90000',
             gasLimit: '0x5028',
@@ -167,7 +171,10 @@ describe('useGasFeeInputs', () => {
         }),
       );
       const { result } = renderHook(() =>
-        useGasFeeInputs(null, { txParams: {}, userFeeLevel: 'medium' }),
+        useGasFeeInputs(null, {
+          txParams: {},
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
+        }),
       );
       expect(result.current.maxFeePerGas).toBe(
         FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates.medium
@@ -226,7 +233,7 @@ describe('useGasFeeInputs', () => {
     it('should return true', () => {
       const { result } = renderHook(() =>
         useGasFeeInputs(null, {
-          userFeeLevel: 'medium',
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
           txParams: { gas: '0x5208' },
         }),
       );
@@ -242,14 +249,14 @@ describe('useGasFeeInputs', () => {
     it('should change estimateToUse value', () => {
       const { result } = renderHook(() =>
         useGasFeeInputs(null, {
-          userFeeLevel: 'medium',
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
           txParams: { gas: '0x5208' },
         }),
       );
       act(() => {
-        result.current.setEstimateToUse('high');
+        result.current.setEstimateToUse(GAS_RECOMMENDATIONS.HIGH);
       });
-      expect(result.current.estimateToUse).toBe('high');
+      expect(result.current.estimateToUse).toBe(GAS_RECOMMENDATIONS.HIGH);
       expect(result.current.maxFeePerGas).toBe(
         FEE_MARKET_ESTIMATE_RETURN_VALUE.gasFeeEstimates.high
           .suggestedMaxFeePerGas,
@@ -269,7 +276,7 @@ describe('useGasFeeInputs', () => {
     it('should change estimateToUse value to custom', () => {
       const { result } = renderHook(() =>
         useGasFeeInputs(null, {
-          userFeeLevel: 'medium',
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
           txParams: { gas: '0x5208' },
         }),
       );
@@ -278,7 +285,7 @@ describe('useGasFeeInputs', () => {
         result.current.setMaxFeePerGas('100');
         result.current.setMaxPriorityFeePerGas('10');
       });
-      expect(result.current.estimateToUse).toBe('custom');
+      expect(result.current.estimateToUse).toBe(CUSTOM_GAS_ESTIMATE);
       expect(result.current.maxFeePerGas).toBe('100');
       expect(result.current.maxPriorityFeePerGas).toBe('10');
     });
@@ -298,7 +305,7 @@ describe('useGasFeeInputs', () => {
     it('does not return fiat values', () => {
       const { result } = renderHook(() =>
         useGasFeeInputs(null, {
-          userFeeLevel: 'medium',
+          userFeeLevel: GAS_RECOMMENDATIONS.MEDIUM,
           txParams: { gas: '0x5208' },
         }),
       );
diff --git a/ui/hooks/gasFeeInput/useGasPriceInput.js b/ui/hooks/gasFeeInput/useGasPriceInput.js
index 2e278da00..acc12207e 100644
--- a/ui/hooks/gasFeeInput/useGasPriceInput.js
+++ b/ui/hooks/gasFeeInput/useGasPriceInput.js
@@ -1,7 +1,10 @@
 import { useState } from 'react';
 import { isEqual } from 'lodash';
 
-import { GAS_ESTIMATE_TYPES } from '../../../shared/constants/gas';
+import {
+  GAS_ESTIMATE_TYPES,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../../shared/constants/gas';
 import { hexWEIToDecGWEI } from '../../helpers/utils/conversions.util';
 import { isLegacyTransaction } from '../../helpers/utils/transactions.util';
 
@@ -30,7 +33,7 @@ export function useGasPriceInput({
   transaction,
 }) {
   const [gasPriceHasBeenManuallySet, setGasPriceHasBeenManuallySet] = useState(
-    transaction?.userFeeLevel === 'custom',
+    transaction?.userFeeLevel === CUSTOM_GAS_ESTIMATE,
   );
 
   const [gasPrice, setGasPrice] = useState(() => {
diff --git a/ui/hooks/gasFeeInput/useGasPriceInput.test.js b/ui/hooks/gasFeeInput/useGasPriceInput.test.js
index 9514f969a..9f1d27431 100644
--- a/ui/hooks/gasFeeInput/useGasPriceInput.test.js
+++ b/ui/hooks/gasFeeInput/useGasPriceInput.test.js
@@ -1,5 +1,9 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 
+import {
+  GAS_RECOMMENDATIONS,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../../shared/constants/gas';
 import {
   FEE_MARKET_ESTIMATE_RETURN_VALUE,
   LEGACY_GAS_ESTIMATE_RETURN_VALUE,
@@ -30,7 +34,7 @@ describe('useGasPriceInput', () => {
     const { result } = renderHook(() =>
       useGasPriceInput({
         transaction: {
-          userFeeLevel: 'custom',
+          userFeeLevel: CUSTOM_GAS_ESTIMATE,
           txParams: { gasPrice: '0x5028' },
         },
       }),
@@ -42,9 +46,9 @@ describe('useGasPriceInput', () => {
     configure();
     const { result } = renderHook(() =>
       useGasPriceInput({
-        estimateToUse: 'high',
+        estimateToUse: GAS_RECOMMENDATIONS.HIGH,
         transaction: {
-          userFeeLevel: 'high',
+          userFeeLevel: GAS_RECOMMENDATIONS.HIGH,
           txParams: { gasPrice: '0x5028' },
         },
         ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
@@ -56,7 +60,7 @@ describe('useGasPriceInput', () => {
   it('if no gasPrice is provided returns default estimate for legacy transaction', () => {
     const { result } = renderHook(() =>
       useGasPriceInput({
-        estimateToUse: 'medium',
+        estimateToUse: GAS_RECOMMENDATIONS.MEDIUM,
         ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
       }),
     );
@@ -66,7 +70,7 @@ describe('useGasPriceInput', () => {
   it('for legacy transaction if estimateToUse is high and no gasPrice is provided returns high estimate value', () => {
     const { result } = renderHook(() =>
       useGasPriceInput({
-        estimateToUse: 'high',
+        estimateToUse: GAS_RECOMMENDATIONS.HIGH,
         ...LEGACY_GAS_ESTIMATE_RETURN_VALUE,
       }),
     );
@@ -76,7 +80,7 @@ describe('useGasPriceInput', () => {
   it('returns 0 if gasPrice is not present in transaction and estimates are also not legacy', () => {
     const { result } = renderHook(() =>
       useGasPriceInput({
-        estimateToUse: 'medium',
+        estimateToUse: GAS_RECOMMENDATIONS.MEDIUM,
         ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
       }),
     );
@@ -85,7 +89,7 @@ describe('useGasPriceInput', () => {
 
   it('returns gasPrice set by user if gasPriceHasBeenManuallySet is true', () => {
     const { result } = renderHook(() =>
-      useGasPriceInput({ estimateToUse: 'medium' }),
+      useGasPriceInput({ estimateToUse: GAS_RECOMMENDATIONS.MEDIUM }),
     );
     act(() => {
       result.current.setGasPriceHasBeenManuallySet(true);
diff --git a/ui/hooks/gasFeeInput/useMaxFeePerGasInput.test.js b/ui/hooks/gasFeeInput/useMaxFeePerGasInput.test.js
index d51c57c0e..318e9d7e9 100644
--- a/ui/hooks/gasFeeInput/useMaxFeePerGasInput.test.js
+++ b/ui/hooks/gasFeeInput/useMaxFeePerGasInput.test.js
@@ -3,6 +3,10 @@ import { act, renderHook } from '@testing-library/react-hooks';
 
 import { getMaximumGasTotalInHexWei } from '../../../shared/modules/gas.utils';
 import { decimalToHex } from '../../helpers/utils/conversions.util';
+import {
+  GAS_RECOMMENDATIONS,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../../shared/constants/gas';
 
 import {
   FEE_MARKET_ESTIMATE_RETURN_VALUE,
@@ -31,9 +35,9 @@ const renderUseMaxFeePerGasInputHook = (props) =>
   renderHook(() =>
     useMaxFeePerGasInput({
       gasLimit: '21000',
-      estimateToUse: 'medium',
+      estimateToUse: GAS_RECOMMENDATIONS.MEDIUM,
       transaction: {
-        userFeeLevel: 'custom',
+        userFeeLevel: CUSTOM_GAS_ESTIMATE,
         txParams: { maxFeePerGas: '0x5028' },
       },
       ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
@@ -55,7 +59,7 @@ describe('useMaxFeePerGasInput', () => {
   it('returns gasPrice values from transaction if transaction.userFeeLevel is custom and maxFeePerGas is not provided', () => {
     const { result } = renderUseMaxFeePerGasInputHook({
       transaction: {
-        userFeeLevel: 'custom',
+        userFeeLevel: CUSTOM_GAS_ESTIMATE,
         txParams: { gasPrice: '0x5028' },
       },
     });
@@ -64,9 +68,9 @@ describe('useMaxFeePerGasInput', () => {
 
   it('does not returns maxFeePerGas values from transaction if transaction.userFeeLevel is not custom', () => {
     const { result } = renderUseMaxFeePerGasInputHook({
-      estimateToUse: 'high',
+      estimateToUse: GAS_RECOMMENDATIONS.HIGH,
       transaction: {
-        userFeeLevel: 'high',
+        userFeeLevel: GAS_RECOMMENDATIONS.HIGH,
         txParams: { maxFeePerGas: '0x5028' },
       },
     });
@@ -79,7 +83,7 @@ describe('useMaxFeePerGasInput', () => {
   it('if no maxFeePerGas is provided by user or in transaction it returns value from fee market estimate', () => {
     const { result } = renderUseMaxFeePerGasInputHook({
       transaction: {
-        userFeeLevel: 'high',
+        userFeeLevel: GAS_RECOMMENDATIONS.HIGH,
         txParams: {},
       },
     });
diff --git a/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.test.js b/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.test.js
index 4539a2363..5601ef98a 100644
--- a/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.test.js
+++ b/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.test.js
@@ -1,6 +1,10 @@
 import { useSelector } from 'react-redux';
 import { act, renderHook } from '@testing-library/react-hooks';
 
+import {
+  GAS_RECOMMENDATIONS,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../../shared/constants/gas';
 import {
   FEE_MARKET_ESTIMATE_RETURN_VALUE,
   LEGACY_GAS_ESTIMATE_RETURN_VALUE,
@@ -28,9 +32,9 @@ const renderUseMaxPriorityFeePerGasInputHook = (props) => {
   return renderHook(() =>
     useMaxPriorityFeePerGasInput({
       gasLimit: '21000',
-      estimateToUse: 'medium',
+      estimateToUse: GAS_RECOMMENDATIONS.MEDIUM,
       transaction: {
-        userFeeLevel: 'custom',
+        userFeeLevel: CUSTOM_GAS_ESTIMATE,
         txParams: { maxPriorityFeePerGas: '0x5028' },
       },
       ...FEE_MARKET_ESTIMATE_RETURN_VALUE,
@@ -56,7 +60,7 @@ describe('useMaxPriorityFeePerGasInput', () => {
   it('returns maxFeePerGas values from transaction if transaction.userFeeLevel is custom and maxPriorityFeePerGas is not provided', () => {
     const { result } = renderUseMaxPriorityFeePerGasInputHook({
       transaction: {
-        userFeeLevel: 'custom',
+        userFeeLevel: CUSTOM_GAS_ESTIMATE,
         txParams: { maxFeePerGas: '0x5028' },
       },
     });
@@ -65,9 +69,9 @@ describe('useMaxPriorityFeePerGasInput', () => {
 
   it('does not returns maxPriorityFeePerGas values from transaction if transaction.userFeeLevel is not custom', () => {
     const { result } = renderUseMaxPriorityFeePerGasInputHook({
-      estimateToUse: 'high',
+      estimateToUse: GAS_RECOMMENDATIONS.HIGH,
       transaction: {
-        userFeeLevel: 'high',
+        userFeeLevel: GAS_RECOMMENDATIONS.HIGH,
         txParams: { maxPriorityFeePerGas: '0x5028' },
       },
     });
diff --git a/ui/hooks/gasFeeInput/utils.js b/ui/hooks/gasFeeInput/utils.js
index ce8b76ac7..3c27f6416 100644
--- a/ui/hooks/gasFeeInput/utils.js
+++ b/ui/hooks/gasFeeInput/utils.js
@@ -1,4 +1,7 @@
-import { GAS_ESTIMATE_TYPES } from '../../../shared/constants/gas';
+import {
+  GAS_ESTIMATE_TYPES,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../../shared/constants/gas';
 
 export function getGasFeeEstimate(
   field,
@@ -14,4 +17,5 @@ export function getGasFeeEstimate(
 }
 
 export const feeParamsAreCustom = (transaction) =>
-  !transaction?.userFeeLevel || transaction?.userFeeLevel === 'custom';
+  !transaction?.userFeeLevel ||
+  transaction?.userFeeLevel === CUSTOM_GAS_ESTIMATE;
diff --git a/ui/hooks/useGasFeeInputs.js b/ui/hooks/useGasFeeInputs.js
deleted file mode 100644
index 6f52425bf..000000000
--- a/ui/hooks/useGasFeeInputs.js
+++ /dev/null
@@ -1,446 +0,0 @@
-import { addHexPrefix } from 'ethereumjs-util';
-import { useCallback, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { isEqual } from 'lodash';
-import { GAS_ESTIMATE_TYPES, EDIT_GAS_MODES } from '../../shared/constants/gas';
-import { multiplyCurrencies } from '../../shared/modules/conversion.utils';
-import {
-  getMaximumGasTotalInHexWei,
-  getMinimumGasTotalInHexWei,
-} from '../../shared/modules/gas.utils';
-import { PRIMARY, SECONDARY } from '../helpers/constants/common';
-import {
-  checkNetworkAndAccountSupports1559,
-  getShouldShowFiat,
-  getAdvancedInlineGasShown,
-} from '../selectors';
-
-import {
-  hexWEIToDecGWEI,
-  decGWEIToHexWEI,
-  decimalToHex,
-  hexToDecimal,
-} from '../helpers/utils/conversions.util';
-import { GAS_FORM_ERRORS } from '../helpers/constants/gas';
-import { isLegacyTransaction } from '../helpers/utils/transactions.util';
-
-import { useCurrencyDisplay } from './useCurrencyDisplay';
-import { useGasFeeEstimates } from './useGasFeeEstimates';
-import { useUserPreferencedCurrency } from './useUserPreferencedCurrency';
-import { useGasFeeErrors } from './useGasFeeErrors';
-
-/**
- * Opaque string type representing a decimal (base 10) number in GWEI
- * @typedef {`${number}`} DecGweiString
- */
-
-/**
- * String value representing the active estimate level to use
- * @typedef {'low' | 'medium' | 'high'} EstimateLevel
- */
-
-/**
- * Pulls out gasPrice estimate from either of the two gasPrice estimation
- * sources, based on the gasEstimateType and current estimateToUse.
- * @param {{import(
- *   '@metamask/controllers'
- * ).GasFeeState['gasFeeEstimates']}} gasFeeEstimates - estimates returned from
- *  the controller
- * @param {import(
- *  './useGasFeeEstimates'
- * ).GasEstimates} gasEstimateType - type of estimate returned from controller
- * @param {EstimateLevel} estimateToUse - current estimate level to use
- * @returns {[DecGweiString]} - gasPrice estimate to use or null
- */
-function getGasPriceEstimate(gasFeeEstimates, gasEstimateType, estimateToUse) {
-  if (gasEstimateType === GAS_ESTIMATE_TYPES.LEGACY) {
-    return gasFeeEstimates?.[estimateToUse] ?? '0';
-  } else if (gasEstimateType === GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
-    return gasFeeEstimates?.gasPrice ?? '0';
-  }
-  return '0';
-}
-
-/**
- * Pulls out gas fee estimate from the estimates returned from controller,
- * based on the gasEstimateType and current estimateToUse.
- * @param {'maxFeePerGas' | 'maxPriorityFeePerGas'} field - field to select
- * @param {{import(
- *   '@metamask/controllers'
- * ).GasFeeState['gasFeeEstimates']}} gasFeeEstimates - estimates returned from
- *  the controller
- * @param {import(
- *  './useGasFeeEstimates'
- * ).GasEstimates} gasEstimateType - type of estimate returned from controller
- * @param {EstimateLevel} estimateToUse - current estimate level to use
- * @returns {[DecGweiString]} - gas fee estimate to use or null
- */
-function getGasFeeEstimate(
-  field,
-  gasFeeEstimates,
-  gasEstimateType,
-  estimateToUse,
-  fallback = '0',
-) {
-  if (gasEstimateType === GAS_ESTIMATE_TYPES.FEE_MARKET) {
-    return gasFeeEstimates?.[estimateToUse]?.[field] ?? String(fallback);
-  }
-  return String(fallback);
-}
-
-/**
- * @typedef {Object} GasFeeInputReturnType
- * @property {DecGweiString} [maxFeePerGas] - the maxFeePerGas input value.
- * @property {string} [maxFeePerGasFiat] - the maxFeePerGas converted to the
- *  user's preferred currency.
- * @property {(DecGweiString) => void} setMaxFeePerGas - state setter method to
- *  update the maxFeePerGas.
- * @property {DecGweiString} [maxPriorityFeePerGas] - the maxPriorityFeePerGas
- *  input value.
- * @property {string} [maxPriorityFeePerGasFiat] - the maxPriorityFeePerGas
- *  converted to the user's preferred currency.
- * @property {(DecGweiString) => void} setMaxPriorityFeePerGas - state setter
- *  method to update the maxPriorityFeePerGas.
- * @property {DecGweiString} [gasPrice] - the gasPrice input value.
- * @property {(DecGweiString) => void} setGasPrice - state setter method to
- *  update the gasPrice.
- * @property {DecGweiString} gasLimit - the gasLimit input value.
- * @property {(DecGweiString) => void} setGasLimit - state setter method to
- *  update the gasLimit.
- * @property {EstimateLevel} [estimateToUse] - the estimate level currently
- *  selected. This will be null if the user has ejected from using the
- *  estimates.
- * @property {([EstimateLevel]) => void} setEstimateToUse - Setter method for
- *  choosing which EstimateLevel to use.
- * @property {string} [estimatedMinimumFiat] - The amount estimated to be paid
- *  based on current network conditions. Expressed in user's preferred
- *  currency.
- * @property {string} [estimatedMaximumFiat] - the maximum amount estimated to be
- *  paid if current network transaction volume increases. Expressed in user's
- *  preferred currency.
- * @property {string} [estimatedMaximumNative] - the maximum amount estimated to
- *  be paid if the current network transaction volume increases. Expressed in
- *  the network's native currency.
- */
-
-/**
- * Uses gasFeeEstimates and state to keep track of user gas fee inputs.
- * Will update the gas fee state when estimates update if the user has not yet
- * modified the fields.
- * @param {EstimateLevel} defaultEstimateToUse - which estimate
- *  level to default the 'estimateToUse' state variable to.
- * @returns {GasFeeInputReturnType & import(
- *  './useGasFeeEstimates'
- * ).GasEstimates} - gas fee input state and the GasFeeEstimates object
- */
-export function useGasFeeInputs(
-  defaultEstimateToUse = 'medium',
-  transaction,
-  minimumGasLimit = '0x5208',
-  editGasMode,
-) {
-  const supportsEIP1559 =
-    useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction?.txParams);
-  // We need to know whether to show fiat conversions or not, so that we can
-  // default our fiat values to empty strings if showing fiat is not wanted or
-  // possible.
-  const showFiat = useSelector(getShouldShowFiat);
-
-  // We need to know the current network's currency and its decimal precision
-  // to calculate the amount to display to the user.
-  const {
-    currency: primaryCurrency,
-    numberOfDecimals: primaryNumberOfDecimals,
-  } = useUserPreferencedCurrency(PRIMARY);
-
-  // For calculating the value of gas fees in the user's preferred currency we
-  // first have to know what that currency is and its decimal precision
-  const {
-    currency: fiatCurrency,
-    numberOfDecimals: fiatNumberOfDecimals,
-  } = useUserPreferencedCurrency(SECONDARY);
-
-  // We need the gas estimates from the GasFeeController in the background.
-  // Calling this hooks initiates polling for new gas estimates and returns the
-  // current estimate.
-  const {
-    gasEstimateType,
-    gasFeeEstimates,
-    isGasEstimatesLoading,
-    estimatedGasFeeTimeBounds,
-  } = useGasFeeEstimates();
-
-  const [initialMaxFeePerGas] = useState(
-    supportsEIP1559 && !transaction?.txParams?.maxFeePerGas
-      ? Number(hexWEIToDecGWEI(transaction?.txParams?.gasPrice))
-      : Number(hexWEIToDecGWEI(transaction?.txParams?.maxFeePerGas)),
-  );
-
-  const [initialMaxPriorityFeePerGas] = useState(
-    supportsEIP1559 && !transaction?.txParams?.maxPriorityFeePerGas
-      ? initialMaxFeePerGas
-      : Number(hexWEIToDecGWEI(transaction?.txParams?.maxPriorityFeePerGas)),
-  );
-  const [initialGasPrice] = useState(
-    Number(hexWEIToDecGWEI(transaction?.txParams?.gasPrice)),
-  );
-
-  const [initialMatchingEstimateLevel] = useState(
-    transaction?.userFeeLevel || null,
-  );
-  const initialFeeParamsAreCustom =
-    initialMatchingEstimateLevel === 'custom' ||
-    initialMatchingEstimateLevel === null;
-
-  // This hook keeps track of a few pieces of transitional state. It is
-  // transitional because it is only used to modify a transaction in the
-  // metamask (background) state tree.
-  const [maxFeePerGas, setMaxFeePerGas] = useState(
-    initialMaxFeePerGas && initialFeeParamsAreCustom
-      ? initialMaxFeePerGas
-      : null,
-  );
-  const [maxPriorityFeePerGas, setMaxPriorityFeePerGas] = useState(
-    initialMaxPriorityFeePerGas && initialFeeParamsAreCustom
-      ? initialMaxPriorityFeePerGas
-      : null,
-  );
-  const [gasPriceHasBeenManuallySet, setGasPriceHasBeenManuallySet] = useState(
-    initialMatchingEstimateLevel === 'custom',
-  );
-  const [gasPrice, setGasPrice] = useState(
-    initialGasPrice && initialFeeParamsAreCustom ? initialGasPrice : null,
-  );
-  const [gasLimit, setGasLimit] = useState(
-    Number(hexToDecimal(transaction?.txParams?.gas ?? '0x0')),
-  );
-
-  const userPrefersAdvancedGas = useSelector(getAdvancedInlineGasShown);
-  const dontDefaultToAnEstimateLevel =
-    userPrefersAdvancedGas &&
-    transaction?.txParams?.maxPriorityFeePerGas &&
-    transaction?.txParams?.maxFeePerGas;
-
-  const initialEstimateToUse = transaction
-    ? initialMatchingEstimateLevel
-    : defaultEstimateToUse;
-
-  const [estimateToUse, setInternalEstimateToUse] = useState(
-    dontDefaultToAnEstimateLevel ? null : initialEstimateToUse,
-  );
-
-  // We specify whether to use the estimate value by checking if the state
-  // value has been set. The state value is only set by user input and is wiped
-  // when the user selects an estimate. Default here is '0' to avoid bignumber
-  // errors in later calculations for nullish values.
-  const maxFeePerGasToUse =
-    maxFeePerGas ??
-    getGasFeeEstimate(
-      'suggestedMaxFeePerGas',
-      gasFeeEstimates,
-      gasEstimateType,
-      estimateToUse,
-      initialMaxFeePerGas,
-    );
-
-  const maxPriorityFeePerGasToUse =
-    maxPriorityFeePerGas ??
-    getGasFeeEstimate(
-      'suggestedMaxPriorityFeePerGas',
-      gasFeeEstimates,
-      gasEstimateType,
-      estimateToUse,
-      initialMaxPriorityFeePerGas,
-    );
-
-  const [initialGasPriceEstimates] = useState(gasFeeEstimates);
-  const gasPriceEstimatesHaveNotChanged = isEqual(
-    initialGasPriceEstimates,
-    gasFeeEstimates,
-  );
-  const gasPriceToUse =
-    gasPrice !== null &&
-    (gasPriceHasBeenManuallySet ||
-      gasPriceEstimatesHaveNotChanged ||
-      isLegacyTransaction(transaction?.txParams))
-      ? gasPrice
-      : getGasPriceEstimate(
-          gasFeeEstimates,
-          gasEstimateType,
-          estimateToUse || defaultEstimateToUse,
-        );
-
-  // We have two helper methods that take an object that can have either
-  // gasPrice OR the EIP-1559 fields on it, plus gasLimit. This object is
-  // conditionally set to the appropriate fields to compute the minimum
-  // and maximum cost of a transaction given the current estimates or selected
-  // gas fees.
-
-  const gasSettings = {
-    gasLimit: decimalToHex(gasLimit),
-  };
-  if (supportsEIP1559) {
-    gasSettings.maxFeePerGas = maxFeePerGasToUse
-      ? decGWEIToHexWEI(maxFeePerGasToUse)
-      : decGWEIToHexWEI(gasPriceToUse || '0');
-    gasSettings.maxPriorityFeePerGas = maxPriorityFeePerGasToUse
-      ? decGWEIToHexWEI(maxPriorityFeePerGasToUse)
-      : gasSettings.maxFeePerGas;
-    gasSettings.baseFeePerGas = decGWEIToHexWEI(
-      gasFeeEstimates.estimatedBaseFee ?? '0',
-    );
-  } else if (gasEstimateType === GAS_ESTIMATE_TYPES.NONE) {
-    gasSettings.gasPrice = '0x0';
-  } else {
-    gasSettings.gasPrice = decGWEIToHexWEI(gasPriceToUse);
-  }
-
-  // The maximum amount this transaction will cost
-  const maximumCostInHexWei = getMaximumGasTotalInHexWei(gasSettings);
-
-  // If in swaps, we want to calculate the minimum gas fee differently than the max
-  const minGasSettings = {};
-  if (editGasMode === EDIT_GAS_MODES.SWAPS) {
-    minGasSettings.gasLimit = decimalToHex(minimumGasLimit);
-  }
-
-  // The minimum amount this transaction will cost's
-  const minimumCostInHexWei = getMinimumGasTotalInHexWei({
-    ...gasSettings,
-    ...minGasSettings,
-  });
-
-  // We need to display the estimated fiat currency impact of the
-  // maxPriorityFeePerGas field to the user. This hook calculates that amount.
-  const [, { value: maxPriorityFeePerGasFiat }] = useCurrencyDisplay(
-    addHexPrefix(
-      multiplyCurrencies(maxPriorityFeePerGasToUse, gasLimit, {
-        toNumericBase: 'hex',
-        fromDenomination: 'GWEI',
-        toDenomination: 'WEI',
-        multiplicandBase: 10,
-        multiplierBase: 10,
-      }),
-    ),
-    {
-      numberOfDecimals: fiatNumberOfDecimals,
-      currency: fiatCurrency,
-    },
-  );
-
-  // We need to display thee estimated fiat currency impact of the maxFeePerGas
-  // field to the user. This hook calculates that amount. This also works for
-  // the gasPrice amount because in legacy transactions cost is always gasPrice
-  // * gasLimit.
-  const [, { value: maxFeePerGasFiat }] = useCurrencyDisplay(
-    maximumCostInHexWei,
-    {
-      numberOfDecimals: fiatNumberOfDecimals,
-      currency: fiatCurrency,
-    },
-  );
-
-  // We need to display the total amount of native currency will be expended
-  // given the selected gas fees.
-  const [estimatedMaximumNative] = useCurrencyDisplay(maximumCostInHexWei, {
-    numberOfDecimals: primaryNumberOfDecimals,
-    currency: primaryCurrency,
-  });
-
-  const [estimatedMinimumNative] = useCurrencyDisplay(minimumCostInHexWei, {
-    numberOfDecimals: primaryNumberOfDecimals,
-    currency: primaryCurrency,
-  });
-
-  // We also need to display our closest estimate of the low end of estimation
-  // in fiat.
-  const [, { value: estimatedMinimumFiat }] = useCurrencyDisplay(
-    minimumCostInHexWei,
-    {
-      numberOfDecimals: fiatNumberOfDecimals,
-      currency: fiatCurrency,
-    },
-  );
-
-  const {
-    gasErrors,
-    hasGasErrors,
-    gasWarnings,
-    balanceError,
-    estimatesUnavailableWarning,
-  } = useGasFeeErrors({
-    transaction,
-    gasEstimateType,
-    gasFeeEstimates,
-    gasLimit,
-    gasPriceToUse,
-    isGasEstimatesLoading,
-    maxPriorityFeePerGasToUse,
-    maxFeePerGasToUse,
-    minimumCostInHexWei,
-    minimumGasLimit,
-  });
-
-  const handleGasLimitOutOfBoundError = useCallback(() => {
-    if (gasErrors.gasLimit === GAS_FORM_ERRORS.GAS_LIMIT_OUT_OF_BOUNDS) {
-      const transactionGasLimitDec = hexToDecimal(transaction?.txParams?.gas);
-      const minimumGasLimitDec = hexToDecimal(minimumGasLimit);
-      setGasLimit(
-        transactionGasLimitDec > minimumGasLimitDec
-          ? transactionGasLimitDec
-          : minimumGasLimitDec,
-      );
-    }
-  }, [minimumGasLimit, gasErrors.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.
-  const setEstimateToUse = (estimateLevel) => {
-    setInternalEstimateToUse(estimateLevel);
-    handleGasLimitOutOfBoundError();
-    setMaxFeePerGas(null);
-    setMaxPriorityFeePerGas(null);
-    setGasPrice(null);
-    setGasPriceHasBeenManuallySet(false);
-  };
-
-  return {
-    maxFeePerGas: maxFeePerGasToUse,
-    maxFeePerGasFiat: showFiat ? maxFeePerGasFiat : '',
-    setMaxFeePerGas,
-    maxPriorityFeePerGas: maxPriorityFeePerGasToUse,
-    maxPriorityFeePerGasFiat: showFiat ? maxPriorityFeePerGasFiat : '',
-    setMaxPriorityFeePerGas,
-    gasPrice: gasPriceToUse,
-    setGasPrice,
-    gasLimit,
-    setGasLimit,
-    estimateToUse,
-    setEstimateToUse,
-    estimatedMinimumFiat: showFiat ? estimatedMinimumFiat : '',
-    estimatedMaximumFiat: showFiat ? maxFeePerGasFiat : '',
-    estimatedMaximumNative,
-    estimatedMinimumNative,
-    isGasEstimatesLoading,
-    gasFeeEstimates,
-    gasEstimateType,
-    estimatedGasFeeTimeBounds,
-    onManualChange: () => {
-      setInternalEstimateToUse('custom');
-      handleGasLimitOutOfBoundError();
-      // Restore existing values
-      setGasPrice(gasPriceToUse);
-      setGasLimit(gasLimit);
-      setMaxFeePerGas(maxFeePerGasToUse);
-      setMaxPriorityFeePerGas(maxPriorityFeePerGasToUse);
-      setGasPriceHasBeenManuallySet(true);
-    },
-    estimatedBaseFee: gasSettings.baseFeePerGas,
-    gasErrors,
-    hasGasErrors,
-    gasWarnings,
-    balanceError,
-    estimatesUnavailableWarning,
-  };
-}
diff --git a/ui/hooks/useUserPreferencedCurrency.js b/ui/hooks/useUserPreferencedCurrency.js
index c41195345..a4716e43f 100644
--- a/ui/hooks/useUserPreferencedCurrency.js
+++ b/ui/hooks/useUserPreferencedCurrency.js
@@ -49,7 +49,7 @@ export function useUserPreferencedCurrency(type, opts = {}) {
   ) {
     // Display ETH
     currency = nativeCurrency || ETH;
-    numberOfDecimals = opts.numberOfDecimals || opts.ethNumberOfDecimals || 6;
+    numberOfDecimals = opts.numberOfDecimals || opts.ethNumberOfDecimals || 8;
   } else if (
     (type === SECONDARY && useNativeCurrencyAsPrimaryCurrency) ||
     (type === PRIMARY && !useNativeCurrencyAsPrimaryCurrency)
diff --git a/ui/hooks/useUserPreferencedCurrency.test.js b/ui/hooks/useUserPreferencedCurrency.test.js
index 62030b7e3..32f987340 100644
--- a/ui/hooks/useUserPreferencedCurrency.test.js
+++ b/ui/hooks/useUserPreferencedCurrency.test.js
@@ -20,7 +20,7 @@ const tests = [
     },
     result: {
       currency: 'ETH',
-      numberOfDecimals: 6,
+      numberOfDecimals: 8,
     },
   },
   {
@@ -82,7 +82,7 @@ const tests = [
     },
     result: {
       currency: 'ETH',
-      numberOfDecimals: 6,
+      numberOfDecimals: 8,
     },
   },
   {
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index 6226f6e22..a00a46e0d 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -1,19 +1,29 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import copyToClipboard from 'copy-to-clipboard';
+import { getTokenTrackerLink, getAccountLink } from '@metamask/etherscan-link';
 import UrlIcon from '../../../components/ui/url-icon';
 import { addressSummary, getURLHostName } from '../../../helpers/utils/util';
 import { formatCurrency } from '../../../helpers/utils/confirm-tx.util';
-import { ConfirmPageContainerWarning } from '../../../components/app/confirm-page-container/confirm-page-container-content';
+import { isBeta } from '../../../helpers/utils/build-types';
+import { ellipsify } from '../../send/send.utils';
 import Typography from '../../../components/ui/typography';
+import Box from '../../../components/ui/box';
+import Button from '../../../components/ui/button';
+import MetaFoxLogo from '../../../components/ui/metafox-logo';
+import Identicon from '../../../components/ui/identicon';
+import CopyIcon from '../../../components/ui/icon/copy-icon.component';
 import {
   TYPOGRAPHY,
   FONT_WEIGHT,
   BLOCK_SIZES,
   JUSTIFY_CONTENT,
+  COLORS,
+  DISPLAY,
 } from '../../../helpers/constants/design-system';
-import Box from '../../../components/ui/box';
-import Button from '../../../components/ui/button';
+import { SECOND } from '../../../../shared/constants/time';
+import { ConfirmPageContainerWarning } from '../../../components/app/confirm-page-container/confirm-page-container-content';
 import LedgerInstructionField from '../../../components/app/ledger-instruction-field';
 
 export default class ConfirmApproveContent extends Component {
@@ -47,10 +57,15 @@ export default class ConfirmApproveContent extends Component {
     warning: PropTypes.string,
     txData: PropTypes.object,
     fromAddressIsLedger: PropTypes.bool,
+    tokenImage: PropTypes.string,
+    chainId: PropTypes.string,
+    rpcPrefs: PropTypes.object,
+    isContract: PropTypes.bool,
   };
 
   state = {
     showFullTxDetails: false,
+    copied: false,
   };
 
   renderApproveContentCard({
@@ -132,8 +147,11 @@ export default class ConfirmApproveContent extends Component {
       tokenSymbol,
       origin,
       toAddress,
+      isContract,
     } = this.props;
-
+    const displayedAddress = isContract
+      ? `${t('contract')} (${addressSummary(toAddress)})`
+      : addressSummary(toAddress);
     return (
       <div className="flex-column">
         <div className="confirm-approve-content__small-text">
@@ -141,7 +159,7 @@ export default class ConfirmApproveContent extends Component {
         </div>
         <div className="flex-row">
           <div className="confirm-approve-content__label">
-            {t('amountWithColon')}
+            {t('approvedAmountWithColon')}
           </div>
           <div className="confirm-approve-content__medium-text">
             {`${Number(customTokenAmount || tokenAmount)} ${tokenSymbol}`}
@@ -149,10 +167,31 @@ export default class ConfirmApproveContent extends Component {
         </div>
         <div className="flex-row">
           <div className="confirm-approve-content__label">
-            {t('toWithColon')}
+            {t('grantedToWithColon')}
           </div>
           <div className="confirm-approve-content__medium-text">
-            {addressSummary(toAddress)}
+            {`${displayedAddress}`}
+          </div>
+          <div className="confirm-approve-content__medium-text">
+            <Button
+              type="link"
+              className="confirm-approve-content__copy-address"
+              onClick={() => {
+                this.setState({ copied: true });
+                this.copyTimeout = setTimeout(
+                  () => this.setState({ copied: false }),
+                  SECOND * 3,
+                );
+                copyToClipboard(toAddress);
+              }}
+              title={
+                this.state.copied
+                  ? t('copiedExclamation')
+                  : t('copyToClipboard')
+              }
+            >
+              <CopyIcon size={14} color="#6a737d" />
+            </Button>
           </div>
         </div>
       </div>
@@ -243,6 +282,11 @@ export default class ConfirmApproveContent extends Component {
       warning,
       txData,
       fromAddressIsLedger,
+      tokenImage,
+      toAddress,
+      chainId,
+      rpcPrefs,
+      isContract,
     } = this.props;
     const { showFullTxDetails } = this.state;
 
@@ -257,20 +301,104 @@ export default class ConfirmApproveContent extends Component {
             <ConfirmPageContainerWarning warning={warning} />
           </div>
         )}
-        <div className="confirm-approve-content__identicon-wrapper">
-          <UrlIcon
-            className="confirm-approve-content__identicon"
-            fallbackClassName="confirm-approve-content__identicon"
-            name={getURLHostName(origin)}
-            url={siteImage}
-          />
-        </div>
+        <Box
+          display={DISPLAY.FLEX}
+          className="confirm-approve-content__icon-display-content"
+        >
+          <Box className="confirm-approve-content__metafoxlogo">
+            <MetaFoxLogo useDark={isBeta()} />
+          </Box>
+          <Box
+            display={DISPLAY.FLEX}
+            className="confirm-approve-content__siteinfo"
+          >
+            <UrlIcon
+              className="confirm-approve-content__siteimage-identicon"
+              fallbackClassName="confirm-approve-content__siteimage-identicon"
+              name={getURLHostName(origin)}
+              url={siteImage}
+            />
+            <Typography
+              variant={TYPOGRAPHY.H6}
+              fontWeight={FONT_WEIGHT.NORMAL}
+              color={COLORS.UI4}
+              boxProps={{ marginLeft: 1, marginTop: 2 }}
+            >
+              {getURLHostName(origin)}
+            </Typography>
+          </Box>
+        </Box>
         <div className="confirm-approve-content__title">
-          {t('allowOriginSpendToken', [origin, tokenSymbol])}
+          {t('allowSpendToken', [tokenSymbol])}
         </div>
         <div className="confirm-approve-content__description">
-          {t('trustSiteApprovePermission', [origin, tokenSymbol])}
+          {t('trustSiteApprovePermission', [
+            isContract
+              ? t('contract').toLowerCase()
+              : t('account').toLowerCase(),
+          ])}
         </div>
+        <Box className="confirm-approve-content__address-display-content">
+          <Box display={DISPLAY.FLEX}>
+            <Identicon
+              className="confirm-approve-content__address-identicon"
+              diameter={20}
+              address={toAddress}
+              image={tokenImage}
+            />
+            <Typography
+              variant={TYPOGRAPHY.H6}
+              fontWeight={FONT_WEIGHT.NORMAL}
+              color={COLORS.UI4}
+              boxProps={{ marginBottom: 0 }}
+            >
+              {ellipsify(toAddress)}
+            </Typography>
+            <Button
+              type="link"
+              className="confirm-approve-content__copy-address"
+              onClick={() => {
+                this.setState({ copied: true });
+                this.copyTimeout = setTimeout(
+                  () => this.setState({ copied: false }),
+                  SECOND * 3,
+                );
+                copyToClipboard(toAddress);
+              }}
+              title={
+                this.state.copied
+                  ? t('copiedExclamation')
+                  : t('copyToClipboard')
+              }
+            >
+              <CopyIcon size={9} color="#6a737d" />
+            </Button>
+            <Button
+              type="link"
+              className="confirm-approve-content__etherscan-link"
+              onClick={() => {
+                const blockExplorerTokenLink = isContract
+                  ? getTokenTrackerLink(toAddress, chainId, null, null, {
+                      blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+                    })
+                  : getAccountLink(
+                      toAddress,
+                      chainId,
+                      { blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null },
+                      null,
+                    );
+                global.platform.openTab({
+                  url: blockExplorerTokenLink,
+                });
+              }}
+              target="_blank"
+              rel="noopener noreferrer"
+              title={t('etherscanView')}
+            >
+              <img src="images/popout.svg" alt={t('etherscanView')} />
+            </Button>
+          </Box>
+        </Box>
         <div className="confirm-approve-content__edit-submission-button-container">
           <div
             className="confirm-approve-content__medium-link-text cursor-pointer"
@@ -292,7 +420,7 @@ export default class ConfirmApproveContent extends Component {
         <div className="confirm-approve-content__card-wrapper">
           {this.renderApproveContentCard({
             symbol: <i className="fa fa-tag" />,
-            title: 'Transaction Fee',
+            title: t('transactionFee'),
             showEdit: true,
             onEditClick: showCustomizeGasModal,
             content: this.renderTransactionDetailsContent(),
@@ -364,7 +492,7 @@ export default class ConfirmApproveContent extends Component {
             <div className="confirm-approve-content__permission">
               {this.renderApproveContentCard({
                 symbol: <img src="./images/user-check.svg" alt="" />,
-                title: 'Permission',
+                title: t('permissionRequest'),
                 content: this.renderPermissionContent(),
                 showEdit: true,
                 onEditClick: () =>
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
new file mode 100644
index 000000000..ab3b94b20
--- /dev/null
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
@@ -0,0 +1,84 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest/rendering';
+import ConfirmApproveContent from '.';
+
+const renderComponent = (props) => {
+  const store = configureMockStore([])({ metamask: {} });
+  return renderWithProvider(<ConfirmApproveContent {...props} />, store);
+};
+
+const props = {
+  decimals: 16,
+  siteImage: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
+  customTokenAmount: '10',
+  tokenAmount: '10',
+  origin: 'https://metamask.github.io/test-dapp/',
+  tokenSymbol: 'TST',
+  tokenImage: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
+  tokenBalance: '15',
+  showCustomizeGasModal: jest.fn(),
+  showEditApprovalPermissionModal: jest.fn(),
+  data:
+    '0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef40000000000000000000000000000000000000000000000000000000000011170',
+  toAddress: '0x9bc5baf874d2da8d216ae9f137804184ee5afef4',
+  currentCurrency: 'TST',
+  nativeCurrency: 'ETH',
+  ethTransactionTotal: '20',
+  fiatTransactionTotal: '10',
+  useNonceField: true,
+  nextNonce: 1,
+  customNonceValue: '2',
+  showCustomizeNonceModal: jest.fn(),
+  chainId: '1337',
+  rpcPrefs: {},
+  isContract: true,
+};
+
+describe('ConfirmApproveContent Component', () => {
+  it('should render Confirm approve page correctly', () => {
+    const { queryByText, getByText, getAllByText } = renderComponent(props);
+    expect(queryByText('metamask.github.io')).toBeInTheDocument();
+    expect(
+      queryByText('Give permission to access your TST?'),
+    ).toBeInTheDocument();
+    expect(
+      queryByText(
+        'By granting permission, you are allowing the following contract to access your funds',
+      ),
+    ).toBeInTheDocument();
+    expect(queryByText('0x9bc5...fef4')).toBeInTheDocument();
+    expect(queryByText('View full transaction details')).toBeInTheDocument();
+
+    expect(queryByText('Edit Permission')).toBeInTheDocument();
+    const editPermission = getByText('Edit Permission');
+    fireEvent.click(editPermission);
+    expect(props.showEditApprovalPermissionModal).toHaveBeenCalledTimes(1);
+
+    const editButtons = getAllByText('Edit');
+
+    expect(queryByText('Transaction Fee')).toBeInTheDocument();
+    expect(
+      queryByText('A fee is associated with this request.'),
+    ).toBeInTheDocument();
+    expect(queryByText(`${props.ethTransactionTotal} ETH`)).toBeInTheDocument();
+    fireEvent.click(editButtons[0]);
+    expect(props.showCustomizeGasModal).toHaveBeenCalledTimes(1);
+
+    expect(queryByText('Nonce')).toBeInTheDocument();
+    expect(queryByText('2')).toBeInTheDocument();
+    fireEvent.click(editButtons[1]);
+    expect(props.showCustomizeNonceModal).toHaveBeenCalledTimes(1);
+
+    const showHideTxDetails = getByText('View full transaction details');
+    expect(queryByText('Permission Request')).not.toBeInTheDocument();
+    expect(queryByText('Approved Amount:')).not.toBeInTheDocument();
+    expect(queryByText('Granted To:')).not.toBeInTheDocument();
+    fireEvent.click(showHideTxDetails);
+    expect(getByText('Permission Request')).toBeInTheDocument();
+    expect(getByText('Approved Amount:')).toBeInTheDocument();
+    expect(getByText('Granted To:')).toBeInTheDocument();
+    expect(getByText('0x9bc5...fef4')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/confirm-approve/confirm-approve-content/index.scss b/ui/pages/confirm-approve/confirm-approve-content/index.scss
index b74a1350d..6422693e7 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/index.scss
+++ b/ui/pages/confirm-approve/confirm-approve-content/index.scss
@@ -5,18 +5,83 @@
   width: 100%;
   font-style: normal;
 
-  &__identicon-wrapper {
+  &__warning {
+    padding: 0 24px 16px 24px;
+  }
+
+  &__icon-display-content {
     display: flex;
-    width: 100%;
+    height: 51px;
+    width: 65%;
+    margin-top: 16px;
+    padding: 12px 12px 14px 12px;
+    border: 1px solid $ui-1;
+    box-sizing: border-box;
+    border-radius: 100px;
+    align-items: center;
+    position: relative;
+  }
+
+  &__metafoxlogo,
+  &__siteinfo {
+    position: absolute;
+  }
+
+  &__metafoxlogo {
+    .app-header {
+      &__metafox-logo--horizontal {
+        display: none;
+      }
+
+      &__metafox-logo--icon {
+        display: block;
+      }
+    }
+  }
+
+  &__siteinfo {
+    left: 39px;
+  }
+
+  &__address-display-content {
+    display: flex;
+    height: 27px;
+    padding: 12px 12px 14px 12px;
+    background-color: $ui-1;
+    border-radius: 100px;
+    align-items: center;
     justify-content: center;
-    margin-top: 22px;
-    padding-left: 24px;
-    padding-right: 24px;
   }
 
-  &__identicon {
-    width: 48px;
-    height: 48px;
+  &__siteimage-identicon {
+    width: 33px;
+    height: 33px;
+    border: solid #fff;
+  }
+
+  &__address-identicon {
+    margin: 4px 8px 0 4px;
+  }
+
+  &__copy-address,
+  &__etherscan-link {
+    padding: 0 0 0 8px;
+  }
+
+  &__etherscan-link {
+    img {
+      width: 9px;
+      height: 9px;
+    }
+  }
+
+  .app-header__logo-container {
+    margin-right: 0;
+  }
+
+  .app-header__metafox-logo--icon {
+    height: 33px;
+    width: 33px;
   }
 
   &__full-tx-content {
diff --git a/ui/pages/confirm-approve/confirm-approve.js b/ui/pages/confirm-approve/confirm-approve.js
index 11ee15cdc..b0e0707bf 100644
--- a/ui/pages/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirm-approve/confirm-approve.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState, useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import ConfirmTransactionBase from '../confirm-transaction-base';
@@ -14,6 +14,7 @@ import {
   getTokenAddressParam,
   getTokenValueParam,
 } from '../../helpers/utils/token-util';
+import { readAddressAsContract } from '../../../shared/modules/contract-utils';
 import { useTokenTracker } from '../../hooks/useTokenTracker';
 import {
   getTokens,
@@ -28,6 +29,8 @@ import {
   getUseNonceField,
   getCustomNonceValue,
   getNextSuggestedNonce,
+  getCurrentChainId,
+  getRpcPrefsForCurrentProvider,
 } from '../../selectors';
 
 import { useApproveTransaction } from '../../hooks/useApproveTransaction';
@@ -59,6 +62,8 @@ export default function ConfirmApprove() {
   const useNonceField = useSelector(getUseNonceField);
   const nextNonce = useSelector(getNextSuggestedNonce);
   const customNonceValue = useSelector(getCustomNonceValue);
+  const chainId = useSelector(getCurrentChainId);
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
 
   const fromAddressIsLedger = useSelector(isAddressLedgerByFromAddress(from));
 
@@ -82,6 +87,7 @@ export default function ConfirmApprove() {
 
   const tokenSymbol = currentToken?.symbol;
   const decimals = Number(currentToken?.decimals);
+  const tokenImage = currentToken?.image;
   const tokenData = getTokenData(data);
   const tokenValue = getTokenValueParam(tokenData);
   const toAddress = getTokenAddressParam(tokenData);
@@ -124,6 +130,19 @@ export default function ConfirmApprove() {
     prevCustomNonce.current = customNonceValue;
     prevNonce.current = nextNonce;
   }, [customNonceValue, nextNonce]);
+
+  const [isContract, setIsContract] = useState(false);
+  const checkIfContract = useCallback(async () => {
+    const { isContractAddress } = await readAddressAsContract(
+      global.eth,
+      toAddress,
+    );
+    setIsContract(isContractAddress);
+  }, [setIsContract, toAddress]);
+  useEffect(() => {
+    checkIfContract();
+  }, [checkIfContract]);
+
   const { origin } = transaction;
   const formattedOrigin = origin
     ? origin[0].toUpperCase() + origin.slice(1)
@@ -157,6 +176,7 @@ export default function ConfirmApprove() {
             tokenAmount={tokenAmount}
             origin={formattedOrigin}
             tokenSymbol={tokenSymbol}
+            tokenImage={tokenImage}
             tokenBalance={tokenBalance}
             showCustomizeGasModal={approveTransaction}
             showEditApprovalPermissionModal={({
@@ -219,6 +239,9 @@ export default function ConfirmApprove() {
             warning={submitWarning}
             txData={transaction}
             fromAddressIsLedger={fromAddressIsLedger}
+            chainId={chainId}
+            rpcPrefs={rpcPrefs}
+            isContract={isContract}
           />
           {showCustomizeGasPopover && (
             <EditGasPopover
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 e984e8d52..aa4eac2f2 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -53,6 +53,12 @@ import {
 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';
+
+// eslint-disable-next-line prefer-destructuring
+const EIP_1559_V2 = process.env.EIP_1559_V2;
+
 const renderHeartBeatIfNotInTest = () =>
   process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />;
 
@@ -409,127 +415,144 @@ export default class ConfirmTransactionBase extends Component {
 
     return (
       <div className="confirm-page-container-content__details">
+        {EIP_1559_V2 && <LowPriorityMessage />}
         <TransactionDetail
           onEdit={() => this.handleEditGas()}
           rows={[
-            <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={
-                        <>
-                          <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>
-                  </>
-                )
-              }
-              detailTitleColor={COLORS.BLACK}
-              detailText={
-                !isMultiLayerFeeNetwork && (
+            EIP_1559_V2 ? (
+              <GasDetailsItem
+                key="gas_details"
+                hexMaximumTransactionFee={hexMaximumTransactionFee}
+                hexMinimumTransactionFee={hexMinimumTransactionFee}
+                isMainnet={isMainnet}
+                maxFeePerGas={maxFeePerGas}
+                maxPriorityFeePerGas={maxPriorityFeePerGas}
+                supportsEIP1559={supportsEIP1559}
+                txData={txData}
+                useNativeCurrencyAsPrimaryCurrency={
+                  useNativeCurrencyAsPrimaryCurrency
+                }
+              />
+            ) : (
+              <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={
+                          <>
+                            <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>
+                    </>
+                  )
+                }
+                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={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}
+                      value={hexMinimumTransactionFee}
                       hideLabel={!useNativeCurrencyAsPrimaryCurrency}
+                      numberOfDecimals={isMultiLayerFeeNetwork ? 18 : 6}
                     />
-                  </div>,
-                ])
-              }
-              subTitle={
-                <>
-                  {txData.dappSuggestedGasFees ? (
-                    <Typography
-                      variant={TYPOGRAPHY.H7}
-                      fontStyle={FONT_STYLE.ITALIC}
-                      color={COLORS.GRAY}
+                  </div>
+                }
+                subText={
+                  !isMultiLayerFeeNetwork &&
+                  t('editGasSubTextFee', [
+                    <b key="editGasSubTextFeeLabel">
+                      {t('editGasSubTextFeeLabel')}
+                    </b>,
+                    <div
+                      key="editGasSubTextFeeValue"
+                      className="confirm-page-container-content__currency-container"
                     >
-                      {t('transactionDetailDappGasMoreInfo')}
-                    </Typography>
-                  ) : (
-                    ''
-                  )}
-                  {supportsEIP1559 && (
-                    <GasTiming
-                      maxPriorityFeePerGas={hexWEIToDecGWEI(
-                        maxPriorityFeePerGas ||
-                          txData.txParams.maxPriorityFeePerGas,
-                      )}
-                      maxFeePerGas={hexWEIToDecGWEI(
-                        maxFeePerGas || txData.txParams.maxFeePerGas,
-                      )}
-                    />
-                  )}
-                </>
-              }
-            />,
+                      {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,
+                        )}
+                      />
+                    )}
+                  </>
+                }
+              />
+            ),
             isMultiLayerFeeNetwork && (
               <MultiLayerFeeMessage
                 transaction={txData}
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 5b646a3b8..1185c81d1 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -49,6 +49,7 @@ import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 
 import { getGasLoadingAnimationIsShowing } from '../../ducks/app/app';
 import { isLegacyTransaction } from '../../helpers/utils/transactions.util';
+import { CUSTOM_GAS_ESTIMATE } from '../../../shared/constants/gas';
 import ConfirmTransactionBase from './confirm-transaction-base.component';
 
 let customNonceValue = '';
@@ -169,7 +170,7 @@ const mapStateToProps = (state, ownProps) => {
   const noGasPrice = !supportsEIP1559 && getNoGasPriceFetched(state);
   const { useNativeCurrencyAsPrimaryCurrency } = getPreferences(state);
   const gasFeeIsCustom =
-    fullTxData.userFeeLevel === 'custom' ||
+    fullTxData.userFeeLevel === CUSTOM_GAS_ESTIMATE ||
     txParamsAreDappSuggested(fullTxData);
   const fromAddressIsLedger = isAddressLedger(state, fromAddress);
   const nativeCurrency = getNativeCurrency(state);
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
new file mode 100644
index 000000000..6ac1e0be0
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js
@@ -0,0 +1,149 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+import { COLORS } from '../../../helpers/constants/design-system';
+import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
+import { hexWEIToDecGWEI } from '../../../helpers/utils/conversions.util';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+import Box from '../../../components/ui/box';
+import Typography from '../../../components/ui/typography/typography';
+import GasTiming from '../../../components/app/gas-timing/gas-timing.component';
+import I18nValue from '../../../components/ui/i18n-value';
+import InfoTooltip from '../../../components/ui/info-tooltip/info-tooltip';
+import LoadingHeartBeat from '../../../components/ui/loading-heartbeat';
+import TransactionDetailItem from '../../../components/app/transaction-detail-item/transaction-detail-item.component';
+import UserPreferencedCurrencyDisplay from '../../../components/app/user-preferenced-currency-display';
+import { useGasFeeContext } from '../../../contexts/gasFee';
+
+const HeartBeat = () =>
+  process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />;
+
+const GasDetailsItem = ({
+  hexMaximumTransactionFee,
+  hexMinimumTransactionFee,
+  isMainnet,
+  maxFeePerGas,
+  maxPriorityFeePerGas,
+  supportsEIP1559,
+  txData,
+  useNativeCurrencyAsPrimaryCurrency,
+}) => {
+  const t = useI18nContext();
+  const { estimateToUse } = useGasFeeContext();
+
+  return (
+    <TransactionDetailItem
+      key="gas-item"
+      detailTitle={
+        <Box display="flex">
+          <Box marginRight={1}>
+            <I18nValue messageKey="transactionDetailGasHeadingV2" />
+          </Box>
+          <span className="gas-details-item__estimate">
+            (<I18nValue messageKey="transactionDetailGasInfoV2" />)
+          </span>
+          <InfoTooltip
+            contentText={
+              <>
+                <Typography fontSize="12px">
+                  {t('transactionDetailGasTooltipIntro', [
+                    isMainnet ? t('networkNameEthereum') : '',
+                  ])}
+                </Typography>
+                <Typography fontSize="12px">
+                  {t('transactionDetailGasTooltipExplanation')}
+                </Typography>
+                <Typography fontSize="12px">
+                  <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>
+                </Typography>
+              </>
+            }
+            position="bottom"
+          />
+        </Box>
+      }
+      detailTitleColor={COLORS.BLACK}
+      detailText={
+        <div className="gas-details-item__currency-container">
+          <HeartBeat />
+          <UserPreferencedCurrencyDisplay
+            type={SECONDARY}
+            value={hexMinimumTransactionFee}
+            hideLabel={Boolean(useNativeCurrencyAsPrimaryCurrency)}
+          />
+        </div>
+      }
+      detailTotal={
+        <div className="gas-details-item__currency-container">
+          <HeartBeat />
+          <UserPreferencedCurrencyDisplay
+            type={PRIMARY}
+            value={hexMinimumTransactionFee}
+            hideLabel={!useNativeCurrencyAsPrimaryCurrency}
+          />
+        </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"
+          >
+            <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,
+            )}
+          />
+        )
+      }
+    />
+  );
+};
+
+GasDetailsItem.propTypes = {
+  hexMaximumTransactionFee: PropTypes.string,
+  hexMinimumTransactionFee: PropTypes.string,
+  isMainnet: PropTypes.bool,
+  maxFeePerGas: PropTypes.string,
+  maxPriorityFeePerGas: PropTypes.string,
+  supportsEIP1559: PropTypes.bool,
+  txData: PropTypes.object,
+  useNativeCurrencyAsPrimaryCurrency: PropTypes.bool,
+};
+
+export default GasDetailsItem;
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
new file mode 100644
index 000000000..e65e3f362
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.scss
@@ -0,0 +1,21 @@
+.gas-details-item {
+  &__estimate {
+    font-weight: 400;
+    font-style: italic;
+    font-size: 12px;
+    color: $Grey-500;
+    line-height: inherit;
+  }
+
+  &__gas-fee-warning {
+    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
new file mode 100644
index 000000000..2d8c97fab
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.test.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+
+import { ETH } from '../../../helpers/constants/common';
+import { GasFeeContextProvider } from '../../../contexts/gasFee';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+
+import GasDetailsItem from './gas-details-item';
+
+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}>
+      <GasDetailsItem txData={{}} {...props} />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('GasDetailsItem', () => {
+  it('should render label', () => {
+    render();
+    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 not show warning icon if estimates are not high', () => {
+    render({ defaultEstimateToUse: 'low' });
+    expect(screen.queryByText('Max fee:')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/confirm-transaction-base/gas-details-item/index.js b/ui/pages/confirm-transaction-base/gas-details-item/index.js
new file mode 100644
index 000000000..f6bacdbeb
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/gas-details-item/index.js
@@ -0,0 +1 @@
+export { default } from './gas-details-item';
diff --git a/ui/pages/confirm-transaction-base/low-priority-message/index.js b/ui/pages/confirm-transaction-base/low-priority-message/index.js
new file mode 100644
index 000000000..7b2838d48
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/low-priority-message/index.js
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..41bb5d132
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.js
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..1a99a03af
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.scss
@@ -0,0 +1,3 @@
+.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
new file mode 100644
index 000000000..9d8e233f3
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.test.js
@@ -0,0 +1,59 @@
+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/create-account/connect-hardware/account-list.js b/ui/pages/create-account/connect-hardware/account-list.js
index f0b8d14d9..caf7ff580 100644
--- a/ui/pages/create-account/connect-hardware/account-list.js
+++ b/ui/pages/create-account/connect-hardware/account-list.js
@@ -5,13 +5,11 @@ import { getAccountLink } from '@metamask/etherscan-link';
 import Button from '../../../components/ui/button';
 import Checkbox from '../../../components/ui/check-box';
 import Dropdown from '../../../components/ui/dropdown';
-import Popover from '../../../components/ui/popover';
 
 import { getURLHostName } from '../../../helpers/utils/util';
 
 class AccountList extends Component {
   state = {
-    showPopover: false,
     pathValue: null,
   };
 
@@ -33,7 +31,7 @@ class AccountList extends Component {
   }
 
   renderHdPathSelector() {
-    const { selectedPath, hdPaths } = this.props;
+    const { device, selectedPath, hdPaths, onPathChange } = this.props;
     const { pathValue } = this.state;
 
     return (
@@ -45,10 +43,11 @@ class AccountList extends Component {
         <div className="hw-connect__hdPath">
           <Dropdown
             className="hw-connect__hdPath__select"
-            options={hdPaths}
+            options={hdPaths[device.toLowerCase()]}
             selectedOption={pathValue || selectedPath}
             onChange={(value) => {
               this.setPath(value);
+              onPathChange(value);
             }}
           />
         </div>
@@ -61,26 +60,18 @@ class AccountList extends Component {
   }
 
   renderHeader() {
+    const { device } = this.props;
+    const shouldShowHDPaths =
+      device.toLowerCase() === 'ledger' || device.toLowerCase() === 'lattice';
     return (
       <div className="hw-connect">
         <h3 className="hw-connect__unlock-title">
           {this.context.t('selectAnAccount')}
         </h3>
+        {shouldShowHDPaths ? this.renderHdPathSelector() : null}
         <h3 className="hw-connect__hdPath__title">
           {this.context.t('selectAnAccount')}
         </h3>
-        <p className="hw-connect__msg">
-          {this.context.t('selectAnAccountHelp')}
-          {this.context.t('selectAnAccountHelpDirections', [
-            <button
-              className="hw-connect__msg-link"
-              onClick={() => this.setState({ showPopover: true })}
-              key="account-help"
-            >
-              {this.context.t('hardwareWalletSupportLinkConversion')}
-            </button>,
-          ])}
-        </p>
       </div>
     );
   }
@@ -228,44 +219,7 @@ class AccountList extends Component {
     );
   }
 
-  renderSelectPathPopover() {
-    const { pathValue } = this.state;
-    const { onPathChange } = this.props;
-
-    const footer = (
-      <div className="switch-ledger-path-popover__footer">
-        <Button
-          onClick={() => this.setState({ showPopover: false })}
-          type="secondary"
-        >
-          {this.context.t('cancel')}
-        </Button>
-        <Button
-          onClick={() => {
-            onPathChange(pathValue);
-            this.setState({ showPopover: false });
-          }}
-          type="primary"
-        >
-          {this.context.t('save')}
-        </Button>
-      </div>
-    );
-
-    return (
-      <Popover
-        title={this.context.t('switchLedgerPaths')}
-        subtitle={this.context.t('switchLedgerPathsText')}
-        contentClassName="switch-ledger-path-popover__content"
-        footer={footer}
-      >
-        {this.renderHdPathSelector()}
-      </Popover>
-    );
-  }
-
   render() {
-    const { showPopover } = this.state;
     return (
       <div className="new-external-account-form account-list">
         {this.renderHeader()}
@@ -273,7 +227,6 @@ class AccountList extends Component {
         {this.renderPagination()}
         {this.renderButtons()}
         {this.renderForgetDevice()}
-        {showPopover ? this.renderSelectPathPopover() : null}
       </div>
     );
   }
diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js
index 66082de07..6b6c3bab5 100644
--- a/ui/pages/create-account/connect-hardware/index.js
+++ b/ui/pages/create-account/connect-hardware/index.js
@@ -20,12 +20,32 @@ const U2F_ERROR = 'U2F';
 const LEDGER_LIVE_PATH = `m/44'/60'/0'/0/0`;
 const MEW_PATH = `m/44'/60'/0'`;
 const BIP44_PATH = `m/44'/60'/0'/0`;
-const HD_PATHS = [
+const LEDGER_HD_PATHS = [
   { name: 'Ledger Live', value: LEDGER_LIVE_PATH },
   { name: 'Legacy (MEW / MyCrypto)', value: MEW_PATH },
   { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: BIP44_PATH },
 ];
 
+const LATTICE_STANDARD_BIP44_PATH = `m/44'/60'/0'/0/x`;
+const LATTICE_LEDGER_LIVE_PATH = `m/44'/60'/x'/0/0`;
+const LATTICE_MEW_PATH = `m/44'/60'/0'/x`;
+const LATTICE_HD_PATHS = [
+  {
+    name: `Standard (${LATTICE_STANDARD_BIP44_PATH})`,
+    value: LATTICE_STANDARD_BIP44_PATH,
+  },
+  {
+    name: `Ledger Live (${LATTICE_LEDGER_LIVE_PATH})`,
+    value: LATTICE_LEDGER_LIVE_PATH,
+  },
+  { name: `Ledger Legacy (${LATTICE_MEW_PATH})`, value: LATTICE_MEW_PATH },
+];
+
+const HD_PATHS = {
+  ledger: LEDGER_HD_PATHS,
+  lattice: LATTICE_HD_PATHS,
+};
+
 class ConnectHardwareForm extends Component {
   static contextTypes = {
     t: PropTypes.func,
@@ -56,7 +76,7 @@ class ConnectHardwareForm extends Component {
   }
 
   async checkIfUnlocked() {
-    for (const device of ['trezor', 'ledger']) {
+    for (const device of ['trezor', 'ledger', 'lattice']) {
       const path = this.props.defaultHdPaths[device];
       const unlocked = await this.props.checkHardwareStatus(device, path);
       if (unlocked) {
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 6b711b176..3f7e6cbe8 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -43,6 +43,23 @@ export default class SelectHardware extends Component {
     );
   }
 
+  renderConnectToLatticeButton() {
+    return (
+      <button
+        className={classnames('hw-connect__btn', {
+          selected: this.state.selectedDevice === 'lattice',
+        })}
+        onClick={(_) => this.setState({ selectedDevice: 'lattice' })}
+      >
+        <img
+          className="hw-connect__btn__img"
+          src="images/lattice-logo.png"
+          alt=""
+        />
+      </button>
+    );
+  }
+
   renderConnectToLedgerButton() {
     return (
       <button
@@ -67,6 +84,12 @@ export default class SelectHardware extends Component {
           {this.renderConnectToLedgerButton()}
           {this.renderConnectToTrezorButton()}
         </div>
+        <div
+          className="hw-connect__btn-wrapper"
+          style={{ margin: '10px 0 0 0' }}
+        >
+          {this.renderConnectToLatticeButton()}
+        </div>
       </>
     );
   }
@@ -130,6 +153,8 @@ export default class SelectHardware extends Component {
         return this.renderLedgerTutorialSteps();
       case 'trezor':
         return this.renderTrezorTutorialSteps();
+      case 'lattice':
+        return this.renderLatticeTutorialSteps();
       default:
         return '';
     }
@@ -191,6 +216,46 @@ export default class SelectHardware extends Component {
     );
   }
 
+  renderLatticeTutorialSteps() {
+    const steps = [
+      {
+        asset: 'connect-lattice',
+        dimensions: { width: '225px', height: '75px' },
+        title: this.context.t('step1LatticeWallet'),
+        message: this.context.t('step1LatticeWalletMsg', [
+          <a
+            className="hw-connect__msg-link"
+            href="https://metamask.zendesk.com/hc/en-us/articles/4408552261275"
+            rel="noopener noreferrer"
+            target="_blank"
+            key="lattice-setup-link"
+          >
+            {this.context.t('hardwareWalletSupportLinkConversion')}
+          </a>,
+        ]),
+      },
+    ];
+
+    return (
+      <div className="hw-tutorial">
+        {steps.map((step, index) => (
+          <div className="hw-connect" key={index}>
+            <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>
+    );
+  }
+
   renderTrezorTutorialSteps() {
     const steps = [
       {
diff --git a/ui/pages/create-account/import-account/index.js b/ui/pages/create-account/import-account/index.js
index 4f94f0965..d8003b4e9 100644
--- a/ui/pages/create-account/import-account/index.js
+++ b/ui/pages/create-account/import-account/index.js
@@ -41,7 +41,7 @@ export default class AccountImportSubview extends Component {
     return (
       <>
         <div className="page-container__header">
-          <div className="page-container__title">Import Account</div>
+          <div className="page-container__title">{t('importAccount')}</div>
           <div className="page-container__subtitle">
             {t('importAccountMsg')}
             <span
diff --git a/ui/pages/create-account/import-account/index.scss b/ui/pages/create-account/import-account/index.scss
index 91580b70a..562040b18 100644
--- a/ui/pages/create-account/import-account/index.scss
+++ b/ui/pages/create-account/import-account/index.scss
@@ -2,6 +2,7 @@
   cursor: pointer;
   text-decoration: underline;
   color: $primary-blue;
+  margin-inline-start: 4px;
 }
 
 .new-account-import-form {
diff --git a/ui/pages/first-time-flow/create-password/create-password.component.js b/ui/pages/first-time-flow/create-password/create-password.component.js
index f3aae1d5c..357ce283b 100644
--- a/ui/pages/first-time-flow/create-password/create-password.component.js
+++ b/ui/pages/first-time-flow/create-password/create-password.component.js
@@ -7,7 +7,6 @@ import {
   INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE,
   INITIALIZE_SEED_PHRASE_INTRO_ROUTE,
 } from '../../../helpers/constants/routes';
-import { isBeta } from '../../../helpers/utils/build-types';
 import NewAccount from './new-account';
 import ImportWithSeedPhrase from './import-with-seed-phrase';
 
@@ -32,7 +31,7 @@ export default class CreatePassword extends PureComponent {
 
     return (
       <div className="first-time-flow__wrapper">
-        <MetaFoxLogo useDark={isBeta()} />
+        <MetaFoxLogo />
         <Switch>
           <Route
             exact
diff --git a/ui/pages/first-time-flow/end-of-flow/end-of-flow.component.js b/ui/pages/first-time-flow/end-of-flow/end-of-flow.component.js
index af23bc052..f9ab3bb33 100644
--- a/ui/pages/first-time-flow/end-of-flow/end-of-flow.component.js
+++ b/ui/pages/first-time-flow/end-of-flow/end-of-flow.component.js
@@ -5,7 +5,6 @@ import Snackbar from '../../../components/ui/snackbar';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { returnToOnboardingInitiator } from '../onboarding-initiator-util';
-import { isBeta } from '../../../helpers/utils/build-types';
 
 export default class EndOfFlowScreen extends PureComponent {
   static contextTypes = {
@@ -68,7 +67,7 @@ export default class EndOfFlowScreen extends PureComponent {
 
     return (
       <div className="end-of-flow">
-        <MetaFoxLogo useDark={isBeta()} />
+        <MetaFoxLogo />
         <div className="end-of-flow__emoji">🎉</div>
         <div className="first-time-flow__header">{t('congratulations')}</div>
         <div className="first-time-flow__text-block end-of-flow__text-1">
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
index 97ba3cd47..883f086d5 100644
--- a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
+++ b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
 import PageContainerFooter from '../../../components/ui/page-container/page-container-footer';
-import { isBeta } from '../../../helpers/utils/build-types';
 
 export default class MetaMetricsOptIn extends Component {
   static propTypes = {
@@ -31,7 +30,7 @@ export default class MetaMetricsOptIn extends Component {
     return (
       <div className="metametrics-opt-in">
         <div className="metametrics-opt-in__main">
-          <MetaFoxLogo useDark={isBeta()} />
+          <MetaFoxLogo />
           <div className="metametrics-opt-in__body-graphic">
             <img src="images/metrics-chart.svg" alt="" />
           </div>
diff --git a/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js b/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js
index db31f3c39..612e86c77 100644
--- a/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js
+++ b/ui/pages/first-time-flow/seed-phrase/seed-phrase.component.js
@@ -11,7 +11,6 @@ import {
   DEFAULT_ROUTE,
 } from '../../../helpers/constants/routes';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
-import { isBeta } from '../../../helpers/utils/build-types';
 import ConfirmSeedPhrase from './confirm-seed-phrase';
 import RevealSeedPhrase from './reveal-seed-phrase';
 import SeedPhraseIntro from './seed-phrase-intro';
@@ -51,7 +50,7 @@ export default class SeedPhrase extends PureComponent {
     return (
       <DragDropContextProvider backend={HTML5Backend}>
         <div className={`first-time-flow__wrapper ${introClass}`}>
-          <MetaFoxLogo useDark={isBeta()} />
+          <MetaFoxLogo />
           <Switch>
             <Route
               exact
diff --git a/ui/pages/first-time-flow/select-action/select-action.component.js b/ui/pages/first-time-flow/select-action/select-action.component.js
index ec9d0f439..7420b1333 100644
--- a/ui/pages/first-time-flow/select-action/select-action.component.js
+++ b/ui/pages/first-time-flow/select-action/select-action.component.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import Button from '../../../components/ui/button';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
 import { INITIALIZE_METAMETRICS_OPT_IN_ROUTE } from '../../../helpers/constants/routes';
-import { isBeta } from '../../../helpers/utils/build-types';
 
 export default class SelectAction extends PureComponent {
   static propTypes = {
@@ -40,7 +39,7 @@ export default class SelectAction extends PureComponent {
 
     return (
       <div className="select-action">
-        <MetaFoxLogo useDark={isBeta()} />
+        <MetaFoxLogo />
 
         <div className="select-action__wrapper">
           <div className="select-action__body">
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index d7d42b9c7..c46449cfd 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -3,6 +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 HomeNotification from '../../components/app/home-notification';
 import MultipleNotifications from '../../components/app/multiple-notifications';
 import TransactionList from '../../components/app/transaction-list';
@@ -15,6 +16,9 @@ import { Tabs, Tab } from '../../components/ui/tabs';
 import { EthOverview } from '../../components/app/wallet-overview';
 import WhatsNewPopup from '../../components/app/whats-new-popup';
 import RecoveryPhraseReminder from '../../components/app/recovery-phrase-reminder';
+import ActionableMessage from '../../components/ui/actionable-message/actionable-message';
+import Typography from '../../components/ui/typography/typography';
+import { TYPOGRAPHY, FONT_WEIGHT } from '../../helpers/constants/design-system';
 
 import { isBeta } from '../../helpers/utils/build-types';
 
@@ -84,6 +88,8 @@ export default class Home extends PureComponent {
     setRecoveryPhraseReminderHasBeenShown: PropTypes.func.isRequired,
     setRecoveryPhraseReminderLastShown: PropTypes.func.isRequired,
     seedPhraseBackedUp: PropTypes.bool.isRequired,
+    newNetworkAdded: PropTypes.string,
+    setNewNetworkAdded: PropTypes.func.isRequired,
   };
 
   state = {
@@ -199,10 +205,36 @@ export default class Home extends PureComponent {
       originOfCurrentTab,
       disableWeb3ShimUsageAlert,
       infuraBlocked,
+      newNetworkAdded,
+      setNewNetworkAdded,
     } = this.props;
-
     return (
       <MultipleNotifications>
+        {newNetworkAdded ? (
+          <ActionableMessage
+            type="info"
+            className="home__new-network-notification"
+            message={
+              <div className="home__new-network-notification-message">
+                <img
+                  src="./images/check_circle.svg"
+                  className="home__new-network-notification-message--image"
+                />
+                <Typography
+                  variant={TYPOGRAPHY.H7}
+                  fontWeight={FONT_WEIGHT.NORMAL}
+                >
+                  {this.context.t('newNetworkAdded', [newNetworkAdded])}
+                </Typography>
+                <button
+                  className="fas fa-times home__close"
+                  title={t('close')}
+                  onClick={() => setNewNetworkAdded('')}
+                />
+              </div>
+            }
+          />
+        ) : null}
         {shouldShowWeb3ShimUsageNotification ? (
           <HomeNotification
             descriptionText={t('web3ShimUsageNotification', [
@@ -397,6 +429,20 @@ export default class Home extends PureComponent {
                   }
                 />
               </Tab>
+              {process.env.COLLECTIBLES_V1 ? (
+                <Tab
+                  activeClassName="home__tab--active"
+                  className="home__tab"
+                  data-testid="home__nfts-tab"
+                  name={t('nfts')}
+                >
+                  <CollectiblesList
+                    onAddNFT={() => {
+                      console.log('Added NFT');
+                    }}
+                  />
+                </Tab>
+              ) : null}
               <Tab
                 activeClassName="home__tab--active"
                 className="home__tab"
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 19768c60d..7fad95d83 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -15,6 +15,7 @@ import {
   getShowWhatsNewPopup,
   getSortedNotificationsToShow,
   getShowRecoveryPhraseReminder,
+  getNewNetworkAdded,
 } from '../../selectors';
 
 import {
@@ -28,6 +29,7 @@ import {
   setAlertEnabledness,
   setRecoveryPhraseReminderHasBeenShown,
   setRecoveryPhraseReminderLastShown,
+  setNewNetworkAdded,
 } from '../../store/actions';
 import { setThreeBoxLastUpdated, hideWhatsNewPopup } from '../../ducks/app/app';
 import { getWeb3ShimUsageAlertEnabledness } from '../../ducks/metamask/metamask';
@@ -112,6 +114,7 @@ const mapStateToProps = (state) => {
     showWhatsNewPopup: getShowWhatsNewPopup(state),
     showRecoveryPhraseReminder: getShowRecoveryPhraseReminder(state),
     seedPhraseBackedUp,
+    newNetworkAdded: getNewNetworkAdded(state),
   };
 };
 
@@ -141,6 +144,9 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setRecoveryPhraseReminderHasBeenShown()),
   setRecoveryPhraseReminderLastShown: (lastShown) =>
     dispatch(setRecoveryPhraseReminderLastShown(lastShown)),
+  setNewNetworkAdded: (newNetwork) => {
+    dispatch(setNewNetworkAdded(newNetwork));
+  },
 });
 
 export default compose(
diff --git a/ui/pages/home/index.scss b/ui/pages/home/index.scss
index d3eaefa78..804c4d8cd 100644
--- a/ui/pages/home/index.scss
+++ b/ui/pages/home/index.scss
@@ -133,4 +133,23 @@
       color: $primary-1;
     }
   }
+
+  &__new-network-notification {
+    margin-bottom: 50px;
+  }
+
+  &__new-network-notification-message {
+    display: flex;
+    flex-direction: row;
+
+    &--image {
+      margin-right: 10px;
+    }
+  }
+
+  &__close {
+    color: $ui-black;
+    background: none;
+    margin-left: 20px;
+  }
 }
diff --git a/ui/pages/onboarding-flow/create-password/create-password.js b/ui/pages/onboarding-flow/create-password/create-password.js
index 66471c67f..fcdbca69a 100644
--- a/ui/pages/onboarding-flow/create-password/create-password.js
+++ b/ui/pages/onboarding-flow/create-password/create-password.js
@@ -131,6 +131,7 @@ export default function CreatePassword({
       >
         <form className="create-password__form" onSubmit={handleCreate}>
           <FormField
+            dataTestId="create-password-new"
             autoFocus
             error={passwordError}
             onChange={handlePasswordChange}
@@ -151,6 +152,7 @@ export default function CreatePassword({
             }
           />
           <FormField
+            dataTestId="create-password-confirm"
             onChange={handleConfirmPasswordChange}
             password={!showPassword}
             error={confirmPasswordError}
@@ -170,6 +172,7 @@ export default function CreatePassword({
             marginBottom={4}
           >
             <CheckBox
+              dataTestId="create-password-terms"
               onClick={() => setTermsChecked(!termsChecked)}
               checked={termsChecked}
             />
@@ -190,6 +193,11 @@ export default function CreatePassword({
             </Typography>
           </Box>
           <Button
+            data-testid={
+              secretRecoveryPhrase
+                ? 'create-password-import'
+                : 'create-password-wallet'
+            }
             type="primary"
             className="create-password__form--submit-button"
             disabled={!isValid || !termsChecked}
diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.js b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
index 9701b6fd4..8a5c53ee9 100644
--- a/ui/pages/onboarding-flow/creation-successful/creation-successful.js
+++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
@@ -96,7 +96,13 @@ export default function CreationSuccessful() {
         >
           {t('setAdvancedPrivacySettings')}
         </Button>
-        <Button type="primary" large rounded onClick={onComplete}>
+        <Button
+          data-testid="onboarding-complete-done"
+          type="primary"
+          large
+          rounded
+          onClick={onComplete}
+        >
           {t('done')}
         </Button>
       </Box>
diff --git a/ui/pages/onboarding-flow/import-srp/import-srp.js b/ui/pages/onboarding-flow/import-srp/import-srp.js
index 7707b5f9b..797aacef4 100644
--- a/ui/pages/onboarding-flow/import-srp/import-srp.js
+++ b/ui/pages/onboarding-flow/import-srp/import-srp.js
@@ -78,6 +78,7 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
               />
             </button>
             <textarea
+              data-testid="import-srp-text"
               className={classnames('srp-text-area__textarea', {
                 'srp-text-area__textarea--blur': !revealSRP,
                 'srp-text-area__textarea--error': error,
@@ -96,6 +97,7 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
           </div>
           <Button
             type="primary"
+            data-testid="import-srp-confirm"
             large
             onClick={() => {
               submitSecretRecoveryPhrase(secretRecoveryPhrase);
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index 51c1a553e..38672c431 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -140,10 +140,18 @@ export default function OnboardingMetametrics() {
         ])}
       </Typography>
       <div className="onboarding-metametrics__buttons">
-        <Button type="secondary" onClick={onCancel}>
+        <Button
+          data-testid="metametrics-no-thanks"
+          type="secondary"
+          onClick={onCancel}
+        >
           {t('noThanks')}
         </Button>
-        <Button type="primary" onClick={onConfirm}>
+        <Button
+          data-testid="metametrics-i-agree"
+          type="primary"
+          onClick={onConfirm}
+        >
           {t('affirmAgree')}
         </Button>
       </div>
diff --git a/ui/pages/onboarding-flow/pin-extension/pin-extension.js b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
index aa010b388..6888fc197 100644
--- a/ui/pages/onboarding-flow/pin-extension/pin-extension.js
+++ b/ui/pages/onboarding-flow/pin-extension/pin-extension.js
@@ -58,6 +58,9 @@ export default function OnboardingPinExtension() {
       </Carousel>
       <div className="onboarding-pin-extension__buttons">
         <Button
+          data-testid={
+            selectedIndex === 0 ? 'pin-extension-next' : 'pin-extension-done'
+          }
           type="primary"
           onClick={() => {
             if (selectedIndex === 0) {
diff --git a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
index 8400375fb..b600b7f78 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
@@ -83,6 +83,7 @@ export default function ConfirmRecoveryPhrase({ secretRecoveryPhrase = '' }) {
       />
       <div className="recovery-phrase__footer">
         <Button
+          data-testid="recovery-phrase-confirm"
           type="primary"
           className="recovery-phrase__footer--button"
           onClick={() => {
diff --git a/ui/pages/onboarding-flow/recovery-phrase/recovery-phrase-chips.js b/ui/pages/onboarding-flow/recovery-phrase/recovery-phrase-chips.js
index 7a2d78bd0..558becb5a 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/recovery-phrase-chips.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/recovery-phrase-chips.js
@@ -36,6 +36,7 @@ export default function RecoveryPhraseChips({
       className="recovery-phrase__secret"
     >
       <div
+        data-testid="recovery-phrase-chips"
         className={classnames('recovery-phrase__chips', {
           'recovery-phrase__chips--hidden': hideSeedPhrase,
         })}
@@ -52,6 +53,7 @@ export default function RecoveryPhraseChips({
                   {`${index + 1}.`}
                 </div>
                 <ChipWithInput
+                  dataTestId={`recovery-phrase-input-${index}`}
                   borderColor={COLORS.PRIMARY1}
                   className="recovery-phrase__chip--with-input"
                   inputValue={inputValue[index]}
@@ -67,7 +69,11 @@ export default function RecoveryPhraseChips({
               <div className="recovery-phrase__chip-item__number">
                 {`${index + 1}.`}
               </div>
-              <Chip className="recovery-phrase__chip" borderColor={COLORS.UI3}>
+              <Chip
+                dataTestId={`recovery-phrase-chip-${index}`}
+                className="recovery-phrase__chip"
+                borderColor={COLORS.UI3}
+              >
                 {word}
               </Chip>
             </div>
diff --git a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
index 06f5efd30..e57ffb841 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
@@ -96,6 +96,7 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
               {copied ? t('copiedExclamation') : t('copyToClipboard')}
             </Button>
             <Button
+              data-testid="recovery-phrase-next"
               type="primary"
               className="recovery-phrase__footer--button"
               onClick={() => {
@@ -107,6 +108,7 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
           </div>
         ) : (
           <Button
+            data-testid="recovery-phrase-reveal"
             type="primary"
             className="recovery-phrase__footer--button"
             onClick={() => {
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
index a1862221f..4201b7986 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
+++ b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
@@ -103,6 +103,7 @@ export default function SecureYourWallet() {
         className="secure-your-wallet__actions"
       >
         <Button
+          data-testid="secure-wallet-later"
           type="secondary"
           rounded
           large
@@ -110,7 +111,13 @@ export default function SecureYourWallet() {
         >
           {t('seedPhraseIntroNotRecommendedButtonCopy')}
         </Button>
-        <Button type="primary" rounded large onClick={handleClickRecommended}>
+        <Button
+          data-testid="secure-wallet-recommended"
+          type="primary"
+          rounded
+          large
+          onClick={handleClickRecommended}
+        >
           {t('seedPhraseIntroRecommendedButtonCopy')}
         </Button>
       </Box>
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js b/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
index 00ceb4558..5cdcdf837 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
+++ b/ui/pages/onboarding-flow/secure-your-wallet/skip-srp-backup-popover.js
@@ -33,6 +33,7 @@ export default function SkipSRPBackup({ handleClose }) {
             {t('goBack')}
           </Button>
           <Button
+            data-testid="skip-srp-backup"
             disabled={!checked}
             type="primary"
             rounded
diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js
index ab5796905..3943575c3 100644
--- a/ui/pages/onboarding-flow/welcome/welcome.js
+++ b/ui/pages/onboarding-flow/welcome/welcome.js
@@ -96,12 +96,20 @@ export default function OnboardingWelcome() {
       </Carousel>
       <ul className="onboarding-welcome__buttons">
         <li>
-          <Button type="primary" onClick={onCreateClick}>
+          <Button
+            data-testid="onboarding-create-wallet"
+            type="primary"
+            onClick={onCreateClick}
+          >
             {t('onboardingCreateWallet')}
           </Button>
         </li>
         <li>
-          <Button type="secondary" onClick={onImportClick}>
+          <Button
+            data-testid="onboarding-import-wallet"
+            type="secondary"
+            onClick={onImportClick}
+          >
             {t('onboardingImportWallet')}
           </Button>
         </li>
diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss
index 300bdcf4a..878344063 100644
--- a/ui/pages/pages.scss
+++ b/ui/pages/pages.scss
@@ -5,6 +5,8 @@
 @import 'confirm-approve/index';
 @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 '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 620e34cff..91a68e17c 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -62,7 +62,6 @@ import {
   ENVIRONMENT_TYPE_POPUP,
 } from '../../../shared/constants/app';
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
-import { isBeta } from '../../helpers/utils/build-types';
 import ConfirmationPage from '../confirmation';
 import OnboardingFlow from '../onboarding-flow/onboarding-flow';
 
@@ -304,7 +303,6 @@ export default class Routes extends Component {
           [`os-${os}`]: os,
           [`browser-${browser}`]: browser,
           'mouse-user-styles': isMouseUser,
-          'beta': isBeta(),
         })}
         dir={textDirection}
         onClick={() => setMouseUserState(true)}
diff --git a/ui/pages/send/send-content/add-recipient/ens-input.component.js b/ui/pages/send/send-content/add-recipient/ens-input.component.js
index 5747d4044..de0332078 100644
--- a/ui/pages/send/send-content/add-recipient/ens-input.component.js
+++ b/ui/pages/send/send-content/add-recipient/ens-input.component.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-import { ellipsify } from '../../send.utils';
 import { isValidDomainName } from '../../../../helpers/utils/util';
 import {
   isBurnAddress,
@@ -106,9 +105,9 @@ export default class EnsInput extends Component {
             <>
               <div className="ens-input__wrapper__input ens-input__wrapper__input--selected">
                 <div className="ens-input__selected-input__title">
-                  {selectedName || ellipsify(selectedAddress)}
+                  {selectedName || selectedAddress}
                 </div>
-                {selectedName && (
+                {selectedName !== selectedAddress && (
                   <div className="ens-input__selected-input__subtitle">
                     {selectedAddress}
                   </div>
diff --git a/ui/pages/send/send-content/send-content.component.js b/ui/pages/send/send-content/send-content.component.js
index 738e85a85..fd44a1c41 100644
--- a/ui/pages/send/send-content/send-content.component.js
+++ b/ui/pages/send/send-content/send-content.component.js
@@ -7,7 +7,9 @@ import {
   GAS_PRICE_FETCH_FAILURE_ERROR_KEY,
   GAS_PRICE_EXCESSIVE_ERROR_KEY,
   UNSENDABLE_ASSET_ERROR_KEY,
+  INSUFFICIENT_FUNDS_FOR_GAS_ERROR_KEY,
 } from '../../../helpers/constants/error-keys';
+import { ASSET_TYPES } from '../../../ducks/send';
 import SendAmountRow from './send-amount-row';
 import SendHexDataRow from './send-hex-data-row';
 import SendAssetRow from './send-asset-row';
@@ -30,6 +32,8 @@ export default class SendContent extends Component {
     isEthGasPrice: PropTypes.bool,
     noGasPrice: PropTypes.bool,
     networkOrAccountNotSupports1559: PropTypes.bool,
+    getIsBalanceInsufficient: PropTypes.bool,
+    asset: PropTypes.object,
   };
 
   render() {
@@ -41,11 +45,17 @@ export default class SendContent extends Component {
       noGasPrice,
       isAssetSendable,
       networkOrAccountNotSupports1559,
+      getIsBalanceInsufficient,
+      asset,
     } = this.props;
 
     let gasError;
     if (gasIsExcessive) gasError = GAS_PRICE_EXCESSIVE_ERROR_KEY;
     else if (noGasPrice) gasError = GAS_PRICE_FETCH_FAILURE_ERROR_KEY;
+    else if (getIsBalanceInsufficient)
+      gasError = INSUFFICIENT_FUNDS_FOR_GAS_ERROR_KEY;
+    const showHexData =
+      this.props.showHexData && asset.type !== ASSET_TYPES.TOKEN;
 
     return (
       <PageContainerContent>
@@ -63,7 +73,7 @@ export default class SendContent extends Component {
           <SendAssetRow />
           <SendAmountRow />
           {networkOrAccountNotSupports1559 ? <SendGasRow /> : null}
-          {this.props.showHexData ? <SendHexDataRow /> : null}
+          {showHexData ? <SendHexDataRow /> : null}
         </div>
       </PageContainerContent>
     );
diff --git a/ui/pages/send/send-content/send-content.component.test.js b/ui/pages/send/send-content/send-content.component.test.js
index d47c8aa4e..7b06b50e3 100644
--- a/ui/pages/send/send-content/send-content.component.test.js
+++ b/ui/pages/send/send-content/send-content.component.test.js
@@ -15,6 +15,7 @@ describe('SendContent Component', () => {
     showHexData: true,
     gasIsExcessive: false,
     networkAndAccountSupports1559: true,
+    asset: { type: 'NATIVE' },
   };
 
   beforeEach(() => {
@@ -73,6 +74,23 @@ describe('SendContent Component', () => {
       expect(wrapper.find(SendHexDataRow)).toHaveLength(0);
     });
 
+    it('should not render the SendHexDataRow if the asset type is TOKEN (ERC-20)', () => {
+      wrapper.setProps({ asset: { type: 'TOKEN' } });
+      const PageContainerContentChild = wrapper
+        .find(PageContainerContent)
+        .children();
+      expect(PageContainerContentChild.childAt(0).is(Dialog)).toStrictEqual(
+        true,
+      );
+      expect(
+        PageContainerContentChild.childAt(1).is(SendAssetRow),
+      ).toStrictEqual(true);
+      expect(
+        PageContainerContentChild.childAt(2).is(SendAmountRow),
+      ).toStrictEqual(true);
+      expect(wrapper.find(SendHexDataRow)).toHaveLength(0);
+    });
+
     it('should not render the Dialog if contact has a name', () => {
       wrapper.setProps({
         showHexData: false,
@@ -106,6 +124,21 @@ describe('SendContent Component', () => {
       ).toStrictEqual(true);
       expect(wrapper.find(Dialog)).toHaveLength(0);
     });
+
+    it('should render insufficient gas dialog', () => {
+      wrapper.setProps({
+        showHexData: false,
+        getIsBalanceInsufficient: true,
+      });
+      const PageContainerContentChild = wrapper
+        .find(PageContainerContent)
+        .children();
+      const errorDialogProps = PageContainerContentChild.childAt(0).props();
+      expect(errorDialogProps.className).toStrictEqual('send__error-dialog');
+      expect(errorDialogProps.children).toStrictEqual(
+        'insufficientFundsForGas_t',
+      );
+    });
   });
 
   it('should not render the asset dropdown if token length is 0', () => {
diff --git a/ui/pages/send/send-content/send-content.container.js b/ui/pages/send/send-content/send-content.container.js
index 83b38dfeb..e5d1c62b9 100644
--- a/ui/pages/send/send-content/send-content.container.js
+++ b/ui/pages/send/send-content/send-content.container.js
@@ -6,7 +6,12 @@ import {
   getNoGasPriceFetched,
   checkNetworkOrAccountNotSupports1559,
 } from '../../../selectors';
-import { getIsAssetSendable, getSendTo } from '../../../ducks/send';
+import {
+  getIsAssetSendable,
+  getIsBalanceInsufficient,
+  getSendTo,
+  getSendAsset,
+} from '../../../ducks/send';
 
 import * as actions from '../../../store/actions';
 import SendContent from './send-content.component';
@@ -28,6 +33,8 @@ function mapStateToProps(state) {
     networkOrAccountNotSupports1559: checkNetworkOrAccountNotSupports1559(
       state,
     ),
+    getIsBalanceInsufficient: getIsBalanceInsufficient(state),
+    asset: getSendAsset(state),
   };
 }
 
diff --git a/ui/pages/send/send-footer/send-footer.container.js b/ui/pages/send/send-footer/send-footer.container.js
index eba93e5d7..3ec6ddbc1 100644
--- a/ui/pages/send/send-footer/send-footer.container.js
+++ b/ui/pages/send/send-footer/send-footer.container.js
@@ -17,6 +17,7 @@ import {
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import { addHexPrefix } from '../../../../app/scripts/lib/util';
 import { getSendToAccounts } from '../../../ducks/metamask/metamask';
+import { CUSTOM_GAS_ESTIMATE } from '../../../../shared/constants/gas';
 import SendFooter from './send-footer.component';
 
 export default connect(mapStateToProps, mapDispatchToProps)(SendFooter);
@@ -39,7 +40,7 @@ function mapStateToProps(state) {
   const gasEstimateType =
     activeButtonIndex >= 0
       ? gasButtonInfo[activeButtonIndex].gasEstimateType
-      : 'custom';
+      : CUSTOM_GAS_ESTIMATE;
 
   return {
     disabled: isSendFormInvalid(state),
diff --git a/ui/pages/send/send.scss b/ui/pages/send/send.scss
index c47b21fe5..6b3df6db9 100644
--- a/ui/pages/send/send.scss
+++ b/ui/pages/send/send.scss
@@ -180,17 +180,13 @@
     &__status-icon {
       @extend %bg-contain;
 
-      background-image: url("/images/search-black.svg");
+      background-image: url('/images/search-black.svg');
       width: 1.125rem;
       height: 1.125rem;
       margin: 0.25rem 0.5rem 0.25rem 0.25rem;
 
-      &--error {
-
-      }
-
       &--valid {
-        background-image: url("/images/check-green-solid.svg");
+        background-image: url('/images/check-green-solid.svg');
       }
     }
 
@@ -213,7 +209,7 @@
       cursor: pointer;
 
       &--erase {
-        background-image: url("/images/close-gray.svg");
+        background-image: url('/images/close-gray.svg');
         background-color: unset;
         width: 0.75rem;
         height: 0.75rem;
@@ -221,7 +217,7 @@
       }
 
       &--qrcode {
-        background-image: url("/images/qr-blue.svg");
+        background-image: url('/images/qr-blue.svg');
         background-color: unset;
         width: 1.5rem;
         height: 1.5rem;
@@ -234,7 +230,7 @@
 
       .ens-input__wrapper {
         &__status-icon {
-          background-image: url("/images/check-green-solid.svg");
+          background-image: url('/images/check-green-solid.svg');
         }
 
         &__input {
@@ -253,6 +249,9 @@
       @include H6;
 
       @extend %ellipsify;
+
+      word-wrap: break-word;
+      white-space: inherit !important;
     }
 
     &__subtitle {
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.js b/ui/pages/settings/advanced-tab/advanced-tab.component.js
index 28e453852..361c7d8c9 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.js
@@ -36,16 +36,18 @@ export default class AdvancedTab extends PureComponent {
     setAdvancedInlineGasFeatureFlag: PropTypes.func,
     advancedInlineGas: PropTypes.bool,
     showFiatInTestnets: PropTypes.bool,
+    showTestNetworks: PropTypes.bool,
     autoLockTimeLimit: PropTypes.number,
     setAutoLockTimeLimit: PropTypes.func.isRequired,
     setShowFiatConversionOnTestnetsPreference: PropTypes.func.isRequired,
+    setShowTestNetworks: PropTypes.func.isRequired,
     threeBoxSyncingAllowed: PropTypes.bool.isRequired,
     setThreeBoxSyncingPermission: PropTypes.func.isRequired,
     threeBoxDisabled: PropTypes.bool.isRequired,
     setIpfsGateway: PropTypes.func.isRequired,
     ipfsGateway: PropTypes.string.isRequired,
     ledgerTransportType: PropTypes.oneOf(Object.values(LEDGER_TRANSPORT_TYPES)),
-    setLedgerLivePreference: PropTypes.func.isRequired,
+    setLedgerTransportPreference: PropTypes.func.isRequired,
     setDismissSeedBackUpReminder: PropTypes.func.isRequired,
     dismissSeedBackUpReminder: PropTypes.bool.isRequired,
     userHasALedgerAccount: PropTypes.bool.isRequired,
@@ -226,6 +228,35 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
+  renderToggleTestNetworks() {
+    const { t } = this.context;
+    const { showTestNetworks, setShowTestNetworks } = this.props;
+
+    return (
+      <div
+        className="settings-page__content-row"
+        data-testid="advanced-setting-show-testnet-conversion"
+      >
+        <div className="settings-page__content-item">
+          <span>{t('showTestnetNetworks')}</span>
+          <div className="settings-page__content-description">
+            {t('showTestnetNetworksDescription')}
+          </div>
+        </div>
+        <div className="settings-page__content-item">
+          <div className="settings-page__content-item-col">
+            <ToggleButton
+              value={showTestNetworks}
+              onToggle={(value) => setShowTestNetworks(!value)}
+              offLabel={t('off')}
+              onLabel={t('on')}
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   renderShowConversionInTestnets() {
     const { t } = this.context;
     const {
@@ -405,7 +436,7 @@ export default class AdvancedTab extends PureComponent {
     const { t } = this.context;
     const {
       ledgerTransportType,
-      setLedgerLivePreference,
+      setLedgerTransportPreference,
       userHasALedgerAccount,
     } = this.props;
 
@@ -470,7 +501,7 @@ export default class AdvancedTab extends PureComponent {
                 ) {
                   this.setState({ showLedgerTransportWarning: true });
                 }
-                setLedgerLivePreference(transportType);
+                setLedgerTransportPreference(transportType);
                 if (
                   transportType === LEDGER_TRANSPORT_TYPES.WEBHID &&
                   userHasALedgerAccount
@@ -618,6 +649,7 @@ export default class AdvancedTab extends PureComponent {
         {this.renderAdvancedGasInputInline()}
         {this.renderHexDataOptIn()}
         {this.renderShowConversionInTestnets()}
+        {this.renderToggleTestNetworks()}
         {this.renderUseNonceOptIn()}
         {this.renderAutoLockTimeLimit()}
         {this.renderThreeBoxControl()}
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
index e403bf4aa..0d09e44fd 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -3,21 +3,28 @@ import sinon from 'sinon';
 import { shallow } from 'enzyme';
 import TextField from '../../../components/ui/text-field';
 import { LEDGER_TRANSPORT_TYPES } from '../../../../shared/constants/hardware-wallets';
+import ToggleButton from '../../../components/ui/toggle-button';
 import AdvancedTab from './advanced-tab.component';
 
 describe('AdvancedTab Component', () => {
-  it('should render correctly when threeBoxFeatureFlag', () => {
-    const root = shallow(
+  let root;
+  let setAutoLockTimeLimitSpy = sinon.spy();
+  const toggleTestnet = sinon.spy();
+
+  beforeAll(() => {
+    root = shallow(
       <AdvancedTab
         ipfsGateway=""
-        setAutoLockTimeLimit={() => undefined}
+        setAutoLockTimeLimit={setAutoLockTimeLimitSpy}
         setIpfsGateway={() => undefined}
         setShowFiatConversionOnTestnetsPreference={() => undefined}
         setThreeBoxSyncingPermission={() => undefined}
+        setShowTestNetworks={toggleTestnet}
+        showTestNetworks={false}
         threeBoxDisabled
         threeBoxSyncingAllowed={false}
         ledgerTransportType={LEDGER_TRANSPORT_TYPES.U2F}
-        setLedgerLivePreference={() => undefined}
+        setLedgerTransportPreference={() => undefined}
         setDismissSeedBackUpReminder={() => undefined}
         dismissSeedBackUpReminder={false}
       />,
@@ -27,13 +34,15 @@ describe('AdvancedTab Component', () => {
         },
       },
     );
+  });
 
-    expect(root.find('.settings-page__content-row')).toHaveLength(12);
+  it('should render correctly when threeBoxFeatureFlag', () => {
+    expect(root.find('.settings-page__content-row')).toHaveLength(13);
   });
 
   it('should update autoLockTimeLimit', () => {
-    const setAutoLockTimeLimitSpy = sinon.spy();
-    const root = shallow(
+    setAutoLockTimeLimitSpy = sinon.spy();
+    root = shallow(
       <AdvancedTab
         ipfsGateway=""
         setAutoLockTimeLimit={setAutoLockTimeLimitSpy}
@@ -43,9 +52,10 @@ describe('AdvancedTab Component', () => {
         threeBoxDisabled
         threeBoxSyncingAllowed={false}
         ledgerTransportType={LEDGER_TRANSPORT_TYPES.U2F}
-        setLedgerLivePreference={() => undefined}
+        setLedgerTransportPreference={() => undefined}
         setDismissSeedBackUpReminder={() => undefined}
         dismissSeedBackUpReminder={false}
+        setShowTestNetworks={toggleTestnet}
       />,
       {
         context: {
@@ -54,7 +64,7 @@ describe('AdvancedTab Component', () => {
       },
     );
 
-    const autoTimeout = root.find('.settings-page__content-row').at(7);
+    const autoTimeout = root.find('.settings-page__content-row').at(8);
     const textField = autoTimeout.find(TextField);
 
     textField.props().onChange({ target: { value: 1440 } });
@@ -63,4 +73,11 @@ describe('AdvancedTab Component', () => {
     autoTimeout.find('.settings-tab__rpc-save-button').simulate('click');
     expect(setAutoLockTimeLimitSpy.args[0][0]).toStrictEqual(1440);
   });
+
+  it('should toggle show test networks', () => {
+    const testNetworks = root.find('.settings-page__content-row').at(6);
+    const toggleButton = testNetworks.find(ToggleButton);
+    toggleButton.first().simulate('toggle');
+    expect(toggleTestnet.calledOnce).toStrictEqual(true);
+  });
 });
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.container.js b/ui/pages/settings/advanced-tab/advanced-tab.container.js
index 434ca2444..ed888571a 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.container.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.container.js
@@ -6,12 +6,13 @@ import {
   setFeatureFlag,
   showModal,
   setShowFiatConversionOnTestnetsPreference,
+  setShowTestNetworks,
   setAutoLockTimeLimit,
   setThreeBoxSyncingPermission,
   turnThreeBoxSyncingOnAndInitialize,
   setUseNonceField,
   setIpfsGateway,
-  setLedgerLivePreference,
+  setLedgerTransportPreference,
   setDismissSeedBackUpReminder,
 } from '../../../store/actions';
 import { getPreferences } from '../../../selectors';
@@ -32,7 +33,11 @@ export const mapStateToProps = (state) => {
     ledgerTransportType,
     dismissSeedBackUpReminder,
   } = metamask;
-  const { showFiatInTestnets, autoLockTimeLimit } = getPreferences(state);
+  const {
+    showFiatInTestnets,
+    showTestNetworks,
+    autoLockTimeLimit,
+  } = getPreferences(state);
 
   const userHasALedgerAccount = doesUserHaveALedgerAccount(state);
 
@@ -41,6 +46,7 @@ export const mapStateToProps = (state) => {
     sendHexData,
     advancedInlineGas,
     showFiatInTestnets,
+    showTestNetworks,
     autoLockTimeLimit,
     threeBoxSyncingAllowed,
     threeBoxDisabled,
@@ -65,6 +71,9 @@ export const mapDispatchToProps = (dispatch) => {
     setShowFiatConversionOnTestnetsPreference: (value) => {
       return dispatch(setShowFiatConversionOnTestnetsPreference(value));
     },
+    setShowTestNetworks: (value) => {
+      return dispatch(setShowTestNetworks(value));
+    },
     setAutoLockTimeLimit: (value) => {
       return dispatch(setAutoLockTimeLimit(value));
     },
@@ -78,8 +87,8 @@ export const mapDispatchToProps = (dispatch) => {
     setIpfsGateway: (value) => {
       return dispatch(setIpfsGateway(value));
     },
-    setLedgerLivePreference: (value) => {
-      return dispatch(setLedgerLivePreference(value));
+    setLedgerTransportPreference: (value) => {
+      return dispatch(setLedgerTransportPreference(value));
     },
     setDismissSeedBackUpReminder: (value) => {
       return dispatch(setDismissSeedBackUpReminder(value));
diff --git a/ui/pages/settings/advanced-tab/advanced-tab.stories.js b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
index 3ba345ead..f72fd5d31 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.stories.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.stories.js
@@ -13,9 +13,10 @@ export const AdvancedTabComponent = () => {
       <AdvancedTab
         setAutoLockTimeLimit={() => undefined}
         setShowFiatConversionOnTestnetsPreference={() => undefined}
+        setShowTestNetworks={() => undefined}
         setThreeBoxSyncingPermission={() => undefined}
         setIpfsGateway={() => undefined}
-        setLedgerLivePreference={() => undefined}
+        setLedgerTransportPreference={() => undefined}
         setDismissSeedBackUpReminder={() => undefined}
         setUseNonceField={() => undefined}
         setHexDataFeatureFlag={() => undefined}
diff --git a/ui/pages/settings/index.scss b/ui/pages/settings/index.scss
index cfb52a122..0ebb018db 100644
--- a/ui/pages/settings/index.scss
+++ b/ui/pages/settings/index.scss
@@ -115,7 +115,7 @@
   &__close-button::after {
     content: '\00D7';
     font-size: 40px;
-    color: $dusty-gray;
+    color: $ui-4;
     cursor: pointer;
   }
 
diff --git a/ui/pages/settings/networks-tab/index.js b/ui/pages/settings/networks-tab/index.js
index fc436c9a4..54e83dfb2 100644
--- a/ui/pages/settings/networks-tab/index.js
+++ b/ui/pages/settings/networks-tab/index.js
@@ -1 +1 @@
-export { default } from './networks-tab.container';
+export { default } from './networks-tab';
diff --git a/ui/pages/settings/networks-tab/index.scss b/ui/pages/settings/networks-tab/index.scss
index d8da8cf79..74942f809 100644
--- a/ui/pages/settings/networks-tab/index.scss
+++ b/ui/pages/settings/networks-tab/index.scss
@@ -1,6 +1,5 @@
 .networks-tab {
   &__content {
-    margin-top: 24px;
     display: flex;
     height: 100%;
     max-width: 739px;
@@ -25,13 +24,35 @@
     }
   }
 
+  &__subheader {
+    @include H4;
+
+    padding: 16px 4px;
+    border-bottom: 1px solid $alto;
+    height: 72px;
+    align-items: center;
+    display: flex;
+    flex-flow: row nowrap;
+  }
+
+  &__subheader--break {
+    margin-inline-start: 10px;
+  }
+
+  &__sub-header-text {
+    @include H4;
+
+    color: $ui-4;
+    margin-right: 10px;
+  }
+
   &__network-form {
     display: flex;
     flex: 1 0 auto;
     flex-direction: column;
     justify-content: space-between;
-    max-width: 343px;
     max-height: 465px;
+    margin-top: 24px;
 
     .page-container__footer {
       border-top: none;
@@ -51,29 +72,39 @@
       max-width: 100%;
       max-height: 100%;
       align-items: center;
-      width: 100%;
+      width: 90%;
       margin-top: 10px;
     }
   }
 
-  &__network-form-row {
-    @media screen and (max-width: $break-small) {
-      width: 93%;
-    }
+  &__add-network-form {
+    display: flex;
+    flex-direction: column;
+    max-height: 465px;
+  }
 
-    &--warning {
-      @include H7;
+  &__network-form-body {
+    display: grid;
+    grid-template-columns: 100%;
+    width: 95%;
 
-      background-color: #fefae8;
-      border: 1px solid #ffd33d;
-      border-radius: 5px;
-      box-sizing: border-box;
-      padding: 12px;
-      margin: 12px 0;
+    &__view-only {
+      width: 100%;
+    }
+  }
 
-      @media screen and (max-width: $break-small) {
-        width: 93%;
-      }
+  &__add-network-form-body {
+    display: grid;
+    grid-template-columns: 48% 48%;
+    // row-gap: 10%;
+    column-gap: 5%;
+    margin-top: 24px;
+    width: 100%;
+  }
+
+  &__network-form-row {
+    @media screen and (max-width: $break-small) {
+      width: 99%;
     }
   }
 
@@ -86,6 +117,7 @@
     @include H6;
 
     color: #000;
+    font-weight: bold;
   }
 
   &__network-form-label-tooltip {
@@ -97,12 +129,14 @@
   &__networks-list {
     flex: 0.5 0 auto;
     max-width: 343px;
+    margin-top: 24px;
 
     @media screen and (max-width: $break-small) {
       flex: 1;
       overflow-y: auto;
       max-width: 100vw;
       width: 100vw;
+      margin-top: 0;
     }
   }
 
@@ -220,13 +254,12 @@
     font-weight: 300;
     color: #cdcdcd;
   }
-}
 
-.network-form {
-  &__footer {
+  &__network-form-footer {
     display: flex;
     flex-flow: row nowrap;
     padding: 0.75rem 0;
+    width: 95%;
 
     @media screen and (max-width: $break-small) {
       width: 93%;
@@ -244,4 +277,19 @@
       margin-right: 3.75rem;
     }
   }
+
+  &__add-network-form-footer {
+    display: flex;
+    flex-flow: row;
+    padding: 0.75rem 0;
+    width: 60%;
+
+    .btn-secondary {
+      margin-right: 0.5rem;
+    }
+
+    .btn-primary {
+      margin-left: 0.5rem;
+    }
+  }
 }
diff --git a/ui/pages/settings/networks-tab/network-form/index.js b/ui/pages/settings/networks-tab/network-form/index.js
deleted file mode 100644
index bd21ef354..000000000
--- a/ui/pages/settings/networks-tab/network-form/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './network-form.component';
diff --git a/ui/pages/settings/networks-tab/network-form/network-form.component.js b/ui/pages/settings/networks-tab/network-form/network-form.component.js
deleted file mode 100644
index 2e722031e..000000000
--- a/ui/pages/settings/networks-tab/network-form/network-form.component.js
+++ /dev/null
@@ -1,651 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import validUrl from 'valid-url';
-import log from 'loglevel';
-import TextField from '../../../../components/ui/text-field';
-import Button from '../../../../components/ui/button';
-import Tooltip from '../../../../components/ui/tooltip';
-import {
-  isPrefixedFormattedHexString,
-  isSafeChainId,
-} from '../../../../../shared/modules/network.utils';
-import { jsonRpcRequest } from '../../../../../shared/modules/rpc.utils';
-import { decimalToHex } from '../../../../helpers/utils/conversions.util';
-
-const FORM_STATE_KEYS = [
-  'rpcUrl',
-  'chainId',
-  'ticker',
-  'networkName',
-  'blockExplorerUrl',
-];
-
-export default class NetworkForm extends PureComponent {
-  static contextTypes = {
-    t: PropTypes.func.isRequired,
-    metricsEvent: PropTypes.func.isRequired,
-  };
-
-  static propTypes = {
-    editRpc: PropTypes.func.isRequired,
-    showConfirmDeleteNetworkModal: PropTypes.func.isRequired,
-    rpcUrl: PropTypes.string,
-    chainId: PropTypes.string,
-    ticker: PropTypes.string,
-    viewOnly: PropTypes.bool,
-    networkName: PropTypes.string,
-    onClear: PropTypes.func.isRequired,
-    setRpcTarget: PropTypes.func.isRequired,
-    networksTabIsInAddMode: PropTypes.bool,
-    isCurrentRpcTarget: PropTypes.bool,
-    blockExplorerUrl: PropTypes.string,
-    rpcPrefs: PropTypes.object,
-    networksToRender: PropTypes.array,
-    onAddNetwork: PropTypes.func.isRequired,
-  };
-
-  static defaultProps = {
-    rpcUrl: '',
-    chainId: '',
-    ticker: '',
-    networkName: '',
-    blockExplorerUrl: '',
-  };
-
-  state = {
-    rpcUrl: this.props.rpcUrl,
-    chainId: this.getDisplayChainId(this.props.chainId),
-    ticker: this.props.ticker,
-    networkName: this.props.networkName,
-    blockExplorerUrl: this.props.blockExplorerUrl,
-    errors: {},
-    isSubmitting: false,
-  };
-
-  componentDidUpdate(prevProps) {
-    const { networksTabIsInAddMode: prevAddMode } = prevProps;
-    const { networksTabIsInAddMode } = this.props;
-
-    if (!prevAddMode && networksTabIsInAddMode) {
-      this.setState({
-        rpcUrl: '',
-        chainId: '',
-        ticker: '',
-        networkName: '',
-        blockExplorerUrl: '',
-        errors: {},
-        isSubmitting: false,
-      });
-    } else {
-      for (const key of FORM_STATE_KEYS) {
-        if (prevProps[key] !== this.props[key]) {
-          this.resetForm();
-          break;
-        }
-      }
-    }
-  }
-
-  componentWillUnmount() {
-    this.setState({
-      rpcUrl: '',
-      chainId: '',
-      ticker: '',
-      networkName: '',
-      blockExplorerUrl: '',
-      errors: {},
-    });
-
-    // onClear will push the network settings route unless was pass false.
-    // Since we call onClear to cause this component to be unmounted, the
-    // route will already have been updated, and we avoid setting it twice.
-    this.props.onClear(false);
-  }
-
-  resetForm() {
-    const {
-      rpcUrl,
-      chainId,
-      ticker,
-      networkName,
-      blockExplorerUrl,
-    } = this.props;
-
-    this.setState({
-      rpcUrl,
-      chainId: this.getDisplayChainId(chainId),
-      ticker,
-      networkName,
-      blockExplorerUrl,
-      errors: {},
-      isSubmitting: false,
-    });
-  }
-
-  /**
-   * Attempts to convert the given chainId to a decimal string, for display
-   * purposes.
-   *
-   * Should be called with the props chainId whenever it is used to set the
-   * component's state.
-   *
-   * @param {unknown} chainId - The chainId to convert.
-   * @returns {string} The props chainId in decimal, or the original value if
-   * it can't be converted.
-   */
-  getDisplayChainId(chainId) {
-    if (!chainId || typeof chainId !== 'string' || !chainId.startsWith('0x')) {
-      return chainId;
-    }
-    return parseInt(chainId, 16).toString(10);
-  }
-
-  /**
-   * Prefixes a given id with '0x' if the prefix does not exist
-   *
-   * @param {string} chainId - The chainId to prefix
-   * @returns {string} The chainId, prefixed with '0x'
-   */
-  prefixChainId(chainId) {
-    let prefixedChainId = chainId;
-    if (!chainId.startsWith('0x')) {
-      prefixedChainId = `0x${parseInt(chainId, 10).toString(16)}`;
-    }
-    return prefixedChainId;
-  }
-
-  onSubmit = async () => {
-    this.setState({
-      isSubmitting: true,
-    });
-
-    try {
-      const {
-        setRpcTarget,
-        rpcUrl: propsRpcUrl,
-        editRpc,
-        rpcPrefs = {},
-        onAddNetwork,
-        networksTabIsInAddMode,
-      } = this.props;
-      const {
-        networkName,
-        rpcUrl,
-        chainId: stateChainId,
-        ticker,
-        blockExplorerUrl,
-      } = this.state;
-
-      const formChainId = stateChainId.trim().toLowerCase();
-      const chainId = this.prefixChainId(formChainId);
-
-      if (!(await this.validateChainIdOnSubmit(formChainId, chainId, rpcUrl))) {
-        this.setState({
-          isSubmitting: false,
-        });
-        return;
-      }
-
-      // After this point, isSubmitting will be reset in componentDidUpdate
-      if (propsRpcUrl && rpcUrl !== propsRpcUrl) {
-        await editRpc(propsRpcUrl, rpcUrl, chainId, ticker, networkName, {
-          ...rpcPrefs,
-          blockExplorerUrl: blockExplorerUrl || rpcPrefs.blockExplorerUrl,
-        });
-      } else {
-        await setRpcTarget(rpcUrl, chainId, ticker, networkName, {
-          ...rpcPrefs,
-          blockExplorerUrl: blockExplorerUrl || rpcPrefs.blockExplorerUrl,
-        });
-      }
-
-      if (networksTabIsInAddMode) {
-        onAddNetwork();
-      }
-    } catch (error) {
-      this.setState({
-        isSubmitting: false,
-      });
-      throw error;
-    }
-  };
-
-  onCancel = () => {
-    const { networksTabIsInAddMode, onClear } = this.props;
-
-    if (networksTabIsInAddMode) {
-      onClear();
-    } else {
-      this.resetForm();
-    }
-  };
-
-  onDelete = () => {
-    const { showConfirmDeleteNetworkModal, rpcUrl, onClear } = this.props;
-    showConfirmDeleteNetworkModal({
-      target: rpcUrl,
-      onConfirm: () => {
-        this.resetForm();
-        onClear();
-      },
-    });
-  };
-
-  isSubmitting() {
-    return this.state.isSubmitting;
-  }
-
-  stateIsUnchanged() {
-    const {
-      rpcUrl,
-      chainId: propsChainId,
-      ticker,
-      networkName,
-      blockExplorerUrl,
-    } = this.props;
-
-    const {
-      rpcUrl: stateRpcUrl,
-      chainId: stateChainId,
-      ticker: stateTicker,
-      networkName: stateNetworkName,
-      blockExplorerUrl: stateBlockExplorerUrl,
-    } = this.state;
-
-    // These added conditions are in case the saved chainId is invalid, which
-    // was possible in versions <8.1 of the extension.
-    // Basically, we always want to be able to overwrite an invalid chain ID.
-    const chainIdIsUnchanged =
-      typeof propsChainId === 'string' &&
-      propsChainId.toLowerCase().startsWith('0x') &&
-      stateChainId === this.getDisplayChainId(propsChainId);
-
-    return (
-      stateRpcUrl === rpcUrl &&
-      chainIdIsUnchanged &&
-      stateTicker === ticker &&
-      stateNetworkName === networkName &&
-      stateBlockExplorerUrl === blockExplorerUrl
-    );
-  }
-
-  renderFormTextField({
-    fieldKey,
-    textFieldId,
-    onChange,
-    value,
-    optionalTextFieldKey,
-    tooltipText,
-    autoFocus = false,
-  }) {
-    const { errors } = this.state;
-    const { viewOnly } = this.props;
-    const errorMessage = errors[fieldKey]?.msg || '';
-
-    return (
-      <div className="networks-tab__network-form-row">
-        <div className="networks-tab__network-form-label">
-          <div className="networks-tab__network-form-label-text">
-            {this.context.t(optionalTextFieldKey || fieldKey)}
-          </div>
-          {!viewOnly && tooltipText ? (
-            <Tooltip
-              position="top"
-              title={tooltipText}
-              wrapperClassName="networks-tab__network-form-label-tooltip"
-            >
-              <i className="fa fa-info-circle" />
-            </Tooltip>
-          ) : null}
-        </div>
-        <TextField
-          type="text"
-          id={textFieldId}
-          onChange={onChange}
-          fullWidth
-          margin="dense"
-          value={value}
-          disabled={viewOnly}
-          error={errorMessage}
-          autoFocus={autoFocus}
-        />
-      </div>
-    );
-  }
-
-  setStateWithValue = (stateKey, validator) => {
-    return (e) => {
-      validator?.(e.target.value, stateKey);
-      this.setState({ [stateKey]: e.target.value });
-    };
-  };
-
-  setErrorTo = (errorKey, errorVal) => {
-    this.setState({
-      errors: {
-        ...this.state.errors,
-        [errorKey]: errorVal,
-      },
-    });
-  };
-
-  setErrorEmpty = (errorKey) => {
-    this.setState({
-      errors: {
-        ...this.state.errors,
-        [errorKey]: {
-          msg: '',
-          key: '',
-        },
-      },
-    });
-  };
-
-  hasError = (errorKey, errorKeyVal) => {
-    return this.state.errors[errorKey]?.key === errorKeyVal;
-  };
-
-  hasErrors = () => {
-    const { errors } = this.state;
-    return Object.keys(errors).some((key) => {
-      const error = errors[key];
-      // Do not factor in duplicate chain id error for submission disabling
-      if (key === 'chainId' && error.key === 'chainIdExistsErrorMsg') {
-        return false;
-      }
-      return error.key && error.msg;
-    });
-  };
-
-  validateChainIdOnChange = (selfRpcUrl, chainIdArg = '') => {
-    const { t } = this.context;
-    const { networksToRender } = this.props;
-    const chainId = chainIdArg.trim();
-
-    let errorKey = '';
-    let errorMessage = '';
-    let radix = 10;
-    let hexChainId = chainId;
-
-    if (!hexChainId.startsWith('0x')) {
-      try {
-        hexChainId = `0x${decimalToHex(hexChainId)}`;
-      } catch (err) {
-        this.setErrorTo('chainId', {
-          key: 'invalidHexNumber',
-          msg: t('invalidHexNumber'),
-        });
-        return;
-      }
-    }
-
-    const [matchingChainId] = networksToRender.filter(
-      (e) => e.chainId === hexChainId && e.rpcUrl !== selfRpcUrl,
-    );
-
-    if (chainId === '') {
-      this.setErrorEmpty('chainId');
-      return;
-    } else if (matchingChainId) {
-      errorKey = 'chainIdExistsErrorMsg';
-      errorMessage = t('chainIdExistsErrorMsg', [
-        matchingChainId.label ?? matchingChainId.labelKey,
-      ]);
-    } else if (chainId.startsWith('0x')) {
-      radix = 16;
-      if (!/^0x[0-9a-f]+$/iu.test(chainId)) {
-        errorKey = 'invalidHexNumber';
-        errorMessage = t('invalidHexNumber');
-      } else if (!isPrefixedFormattedHexString(chainId)) {
-        errorMessage = t('invalidHexNumberLeadingZeros');
-      }
-    } else if (!/^[0-9]+$/u.test(chainId)) {
-      errorKey = 'invalidNumber';
-      errorMessage = t('invalidNumber');
-    } else if (chainId.startsWith('0')) {
-      errorKey = 'invalidNumberLeadingZeros';
-      errorMessage = t('invalidNumberLeadingZeros');
-    } else if (!isSafeChainId(parseInt(chainId, radix))) {
-      errorKey = 'invalidChainIdTooBig';
-      errorMessage = t('invalidChainIdTooBig');
-    }
-
-    this.setErrorTo('chainId', {
-      key: errorKey,
-      msg: errorMessage,
-    });
-  };
-
-  /**
-   * Validates the chain ID by checking it against the `eth_chainId` return
-   * value from the given RPC URL.
-   * Assumes that all strings are non-empty and correctly formatted.
-   *
-   * @param {string} formChainId - Non-empty, hex or decimal number string from
-   * the form.
-   * @param {string} parsedChainId - The parsed, hex string chain ID.
-   * @param {string} rpcUrl - The RPC URL from the form.
-   */
-  validateChainIdOnSubmit = async (formChainId, parsedChainId, rpcUrl) => {
-    const { t } = this.context;
-    let errorKey;
-    let errorMessage;
-    let endpointChainId;
-    let providerError;
-
-    try {
-      endpointChainId = await jsonRpcRequest(rpcUrl, 'eth_chainId');
-    } catch (err) {
-      log.warn('Failed to fetch the chainId from the endpoint.', err);
-      providerError = err;
-    }
-
-    if (providerError || typeof endpointChainId !== 'string') {
-      errorKey = 'failedToFetchChainId';
-      errorMessage = t('failedToFetchChainId');
-    } else if (parsedChainId !== endpointChainId) {
-      // Here, we are in an error state. The endpoint should always return a
-      // hexadecimal string. If the user entered a decimal string, we attempt
-      // to convert the endpoint's return value to decimal before rendering it
-      // in an error message in the form.
-      if (!formChainId.startsWith('0x')) {
-        try {
-          endpointChainId = parseInt(endpointChainId, 16).toString(10);
-        } catch (err) {
-          log.warn(
-            'Failed to convert endpoint chain ID to decimal',
-            endpointChainId,
-          );
-        }
-      }
-
-      errorKey = 'endpointReturnedDifferentChainId';
-      errorMessage = t('endpointReturnedDifferentChainId', [
-        endpointChainId.length <= 12
-          ? endpointChainId
-          : `${endpointChainId.slice(0, 9)}...`,
-      ]);
-    }
-
-    if (errorKey) {
-      this.setErrorTo('chainId', {
-        key: errorKey,
-        msg: errorMessage,
-      });
-      return false;
-    }
-
-    this.setErrorEmpty('chainId');
-    return true;
-  };
-
-  isValidWhenAppended = (url) => {
-    const appendedRpc = `http://${url}`;
-    return validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/u);
-  };
-
-  validateBlockExplorerURL = (url, stateKey) => {
-    const { t } = this.context;
-    if (!validUrl.isWebUri(url) && url !== '') {
-      let errorKey;
-      let errorMessage;
-
-      if (this.isValidWhenAppended(url)) {
-        errorKey = 'urlErrorMsg';
-        errorMessage = t('urlErrorMsg');
-      } else {
-        errorKey = 'invalidBlockExplorerURL';
-        errorMessage = t('invalidBlockExplorerURL');
-      }
-
-      this.setErrorTo(stateKey, {
-        key: errorKey,
-        msg: errorMessage,
-      });
-    } else {
-      this.setErrorEmpty(stateKey);
-    }
-  };
-
-  validateUrlRpcUrl = (url, stateKey) => {
-    const { t } = this.context;
-    const { networksToRender } = this.props;
-    const { chainId: stateChainId } = this.state;
-    const isValidUrl = validUrl.isWebUri(url);
-    const chainIdFetchFailed = this.hasError('chainId', 'failedToFetchChainId');
-    const [matchingRPCUrl] = networksToRender.filter((e) => e.rpcUrl === url);
-
-    if (!isValidUrl && url !== '') {
-      let errorKey;
-      let errorMessage;
-      if (this.isValidWhenAppended(url)) {
-        errorKey = 'urlErrorMsg';
-        errorMessage = t('urlErrorMsg');
-      } else {
-        errorKey = 'invalidRPC';
-        errorMessage = t('invalidRPC');
-      }
-      this.setErrorTo(stateKey, {
-        key: errorKey,
-        msg: errorMessage,
-      });
-    } else if (matchingRPCUrl) {
-      this.setErrorTo(stateKey, {
-        key: 'urlExistsErrorMsg',
-        msg: t('urlExistsErrorMsg', [
-          matchingRPCUrl.label ?? matchingRPCUrl.labelKey,
-        ]),
-      });
-    } else {
-      this.setErrorEmpty(stateKey);
-    }
-
-    // Re-validate the chain id if it could not be found with previous rpc url
-    if (stateChainId && isValidUrl && chainIdFetchFailed) {
-      const formChainId = stateChainId.trim().toLowerCase();
-      const chainId = this.prefixChainId(formChainId);
-      this.validateChainIdOnSubmit(formChainId, chainId, url);
-    }
-  };
-
-  renderWarning() {
-    const { t } = this.context;
-    return (
-      <div className="networks-tab__network-form-row--warning">
-        {t('onlyAddTrustedNetworks')}
-      </div>
-    );
-  }
-
-  render() {
-    const { t } = this.context;
-    const { viewOnly, isCurrentRpcTarget, networksTabIsInAddMode } = this.props;
-    const {
-      networkName,
-      rpcUrl,
-      chainId = '',
-      ticker,
-      blockExplorerUrl,
-    } = this.state;
-
-    const deletable =
-      !networksTabIsInAddMode && !isCurrentRpcTarget && !viewOnly;
-    const isSubmitDisabled =
-      this.hasErrors() ||
-      this.isSubmitting() ||
-      this.stateIsUnchanged() ||
-      !rpcUrl ||
-      !chainId;
-
-    return (
-      <div className="networks-tab__network-form">
-        {viewOnly ? null : this.renderWarning()}
-        {this.renderFormTextField({
-          fieldKey: 'networkName',
-          textFieldId: 'network-name',
-          onChange: this.setStateWithValue('networkName'),
-          value: networkName,
-          autoFocus: networksTabIsInAddMode,
-        })}
-        {this.renderFormTextField({
-          fieldKey: 'rpcUrl',
-          textFieldId: 'rpc-url',
-          onChange: this.setStateWithValue('rpcUrl', this.validateUrlRpcUrl),
-          value: rpcUrl,
-        })}
-        {this.renderFormTextField({
-          fieldKey: 'chainId',
-          textFieldId: 'chainId',
-          onChange: this.setStateWithValue(
-            'chainId',
-            this.validateChainIdOnChange.bind(this, rpcUrl),
-          ),
-          value: chainId,
-          tooltipText: viewOnly ? null : t('networkSettingsChainIdDescription'),
-        })}
-        {this.renderFormTextField({
-          fieldKey: 'symbol',
-          textFieldId: 'network-ticker',
-          onChange: this.setStateWithValue('ticker'),
-          value: ticker,
-          optionalTextFieldKey: 'optionalCurrencySymbol',
-        })}
-        {this.renderFormTextField({
-          fieldKey: 'blockExplorerUrl',
-          textFieldId: 'block-explorer-url',
-          onChange: this.setStateWithValue(
-            'blockExplorerUrl',
-            this.validateBlockExplorerURL,
-          ),
-          value: blockExplorerUrl,
-          optionalTextFieldKey: 'optionalBlockExplorerUrl',
-        })}
-        <div className="network-form__footer">
-          {!viewOnly && (
-            <>
-              {deletable && (
-                <Button type="danger" onClick={this.onDelete}>
-                  {t('delete')}
-                </Button>
-              )}
-              <Button
-                type="secondary"
-                onClick={this.onCancel}
-                disabled={this.stateIsUnchanged()}
-              >
-                {t('cancel')}
-              </Button>
-              <Button
-                type="primary"
-                disabled={isSubmitDisabled}
-                onClick={this.onSubmit}
-              >
-                {t('save')}
-              </Button>
-            </>
-          )}
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/ui/pages/settings/networks-tab/networks-form/index.js b/ui/pages/settings/networks-tab/networks-form/index.js
new file mode 100644
index 000000000..b91c8a5e0
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-form/index.js
@@ -0,0 +1 @@
+export { default } from './networks-form';
diff --git a/ui/pages/settings/networks-tab/networks-form/networks-form.js b/ui/pages/settings/networks-tab/networks-form/networks-form.js
new file mode 100644
index 000000000..5f73af7e7
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.js
@@ -0,0 +1,575 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useHistory } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import validUrl from 'valid-url';
+import log from 'loglevel';
+import classnames from 'classnames';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import {
+  isPrefixedFormattedHexString,
+  isSafeChainId,
+} from '../../../../../shared/modules/network.utils';
+import { jsonRpcRequest } from '../../../../../shared/modules/rpc.utils';
+import ActionableMessage from '../../../../components/ui/actionable-message';
+import Button from '../../../../components/ui/button';
+import FormField from '../../../../components/ui/form-field';
+import { decimalToHex } from '../../../../helpers/utils/conversions.util';
+import {
+  setSelectedSettingsRpcUrl,
+  updateAndSetCustomRpc,
+  editRpc,
+  showModal,
+  setNewNetworkAdded,
+} from '../../../../store/actions';
+import {
+  DEFAULT_ROUTE,
+  NETWORKS_ROUTE,
+} from '../../../../helpers/constants/routes';
+
+/**
+ * Attempts to convert the given chainId to a decimal string, for display
+ * purposes.
+ *
+ * Should be called with the props chainId whenever it is used to set the
+ * component's state.
+ *
+ * @param {unknown} chainId - The chainId to convert.
+ * @returns {string} The props chainId in decimal, or the original value if
+ * it can't be converted.
+ */
+const getDisplayChainId = (chainId) => {
+  if (!chainId || typeof chainId !== 'string' || !chainId.startsWith('0x')) {
+    return chainId;
+  }
+  return parseInt(chainId, 16).toString(10);
+};
+
+/**
+ * Prefixes a given id with '0x' if the prefix does not exist
+ *
+ * @param {string} chainId - The chainId to prefix
+ * @returns {string} The chainId, prefixed with '0x'
+ */
+const prefixChainId = (chainId) => {
+  let prefixedChainId = chainId;
+  if (!chainId.startsWith('0x')) {
+    prefixedChainId = `0x${parseInt(chainId, 10).toString(16)}`;
+  }
+  return prefixedChainId;
+};
+
+const isValidWhenAppended = (url) => {
+  const appendedRpc = `http://${url}`;
+  return validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/u);
+};
+
+const NetworksForm = ({
+  addNewNetwork,
+  isCurrentRpcTarget,
+  networksToRender,
+  selectedNetwork,
+}) => {
+  const t = useI18nContext();
+  const history = useHistory();
+  const dispatch = useDispatch();
+  const { label, labelKey, viewOnly, rpcPrefs } = selectedNetwork;
+  const selectedNetworkName = label || (labelKey && t(labelKey));
+  const [networkName, setNetworkName] = useState(selectedNetworkName || '');
+  const [rpcUrl, setRpcUrl] = useState(selectedNetwork?.rpcUrl || '');
+  const [chainId, setChainId] = useState(selectedNetwork?.chainId || '');
+  const [ticker, setTicker] = useState(selectedNetwork?.ticker || '');
+  const [blockExplorerUrl, setBlockExplorerUrl] = useState(
+    selectedNetwork?.blockExplorerUrl || '',
+  );
+  const [errors, setErrors] = useState({});
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const resetForm = useCallback(() => {
+    setNetworkName(selectedNetworkName || '');
+    setRpcUrl(selectedNetwork.rpcUrl);
+    setChainId(getDisplayChainId(selectedNetwork.chainId));
+    setTicker(selectedNetwork?.ticker);
+    setBlockExplorerUrl(selectedNetwork?.blockExplorerUrl);
+    setErrors({});
+    setIsSubmitting(false);
+  }, [selectedNetwork, selectedNetworkName]);
+
+  const stateIsUnchanged = () => {
+    // These added conditions are in case the saved chainId is invalid, which
+    // was possible in versions <8.1 of the extension.
+    // Basically, we always want to be able to overwrite an invalid chain ID.
+    const chainIdIsUnchanged =
+      typeof selectedNetwork.chainId === 'string' &&
+      selectedNetwork.chainId.toLowerCase().startsWith('0x') &&
+      chainId === getDisplayChainId(selectedNetwork.chainId);
+    return (
+      rpcUrl === selectedNetwork.rpcUrl &&
+      chainIdIsUnchanged &&
+      ticker === selectedNetwork.ticker &&
+      networkName === selectedNetworkName &&
+      blockExplorerUrl === selectedNetwork.blockExplorerUrl
+    );
+  };
+
+  const prevAddNewNetwork = useRef();
+  const prevNetworkName = useRef();
+  const prevChainId = useRef();
+  const prevRpcUrl = useRef();
+  const prevTicker = useRef();
+  const prevBlockExplorerUrl = useRef();
+  useEffect(() => {
+    if (!prevAddNewNetwork.current && addNewNetwork) {
+      setNetworkName('');
+      setRpcUrl('');
+      setChainId('');
+      setTicker('');
+      setBlockExplorerUrl('');
+      setErrors({});
+      setIsSubmitting(false);
+    } else if (
+      prevNetworkName.current !== selectedNetworkName ||
+      prevRpcUrl.current !== selectedNetwork.rpcUrl ||
+      prevChainId.current !== selectedNetwork.chainId ||
+      prevTicker.current !== selectedNetwork.ticker ||
+      prevBlockExplorerUrl.current !== selectedNetwork.blockExplorerUrl
+    ) {
+      resetForm(selectedNetwork);
+    }
+  }, [
+    selectedNetwork,
+    selectedNetworkName,
+    addNewNetwork,
+    setNetworkName,
+    setRpcUrl,
+    setChainId,
+    setTicker,
+    setBlockExplorerUrl,
+    setErrors,
+    setIsSubmitting,
+    resetForm,
+  ]);
+
+  useEffect(() => {
+    return () => {
+      setNetworkName('');
+      setRpcUrl('');
+      setChainId('');
+      setTicker('');
+      setBlockExplorerUrl('');
+      setErrors({});
+      dispatch(setSelectedSettingsRpcUrl(''));
+    };
+  }, [
+    setNetworkName,
+    setRpcUrl,
+    setChainId,
+    setTicker,
+    setBlockExplorerUrl,
+    setErrors,
+    dispatch,
+  ]);
+
+  const setErrorTo = (errorKey, errorVal) => {
+    setErrors({ ...errors, [errorKey]: errorVal });
+  };
+
+  const setErrorEmpty = (errorKey) => {
+    setErrors({
+      ...errors,
+      [errorKey]: {
+        msg: '',
+        key: '',
+      },
+    });
+  };
+
+  const hasError = (errorKey, errorKeyVal) => {
+    return errors[errorKey]?.key === errorKeyVal;
+  };
+
+  const hasErrors = () => {
+    return Object.keys(errors).some((key) => {
+      const error = errors[key];
+      // Do not factor in duplicate chain id error for submission disabling
+      if (key === 'chainId' && error.key === 'chainIdExistsErrorMsg') {
+        return false;
+      }
+      return error.key && error.msg;
+    });
+  };
+
+  const validateChainIdOnChange = (chainArg = '') => {
+    const formChainId = chainArg.trim();
+    let errorKey = '';
+    let errorMessage = '';
+    let radix = 10;
+    let hexChainId = formChainId;
+
+    if (!hexChainId.startsWith('0x')) {
+      try {
+        hexChainId = `0x${decimalToHex(hexChainId)}`;
+      } catch (err) {
+        setErrorTo('chainId', {
+          key: 'invalidHexNumber',
+          msg: t('invalidHexNumber'),
+        });
+        return;
+      }
+    }
+
+    const [matchingChainId] = networksToRender.filter(
+      (e) => e.chainId === hexChainId && e.rpcUrl !== rpcUrl,
+    );
+
+    if (formChainId === '') {
+      setErrorEmpty('chainId');
+      return;
+    } else if (matchingChainId) {
+      errorKey = 'chainIdExistsErrorMsg';
+      errorMessage = t('chainIdExistsErrorMsg', [
+        matchingChainId.label ?? matchingChainId.labelKey,
+      ]);
+    } else if (formChainId.startsWith('0x')) {
+      radix = 16;
+      if (!/^0x[0-9a-f]+$/iu.test(formChainId)) {
+        errorKey = 'invalidHexNumber';
+        errorMessage = t('invalidHexNumber');
+      } else if (!isPrefixedFormattedHexString(formChainId)) {
+        errorMessage = t('invalidHexNumberLeadingZeros');
+      }
+    } else if (!/^[0-9]+$/u.test(formChainId)) {
+      errorKey = 'invalidNumber';
+      errorMessage = t('invalidNumber');
+    } else if (formChainId.startsWith('0')) {
+      errorKey = 'invalidNumberLeadingZeros';
+      errorMessage = t('invalidNumberLeadingZeros');
+    } else if (!isSafeChainId(parseInt(formChainId, radix))) {
+      errorKey = 'invalidChainIdTooBig';
+      errorMessage = t('invalidChainIdTooBig');
+    }
+
+    setErrorTo('chainId', {
+      key: errorKey,
+      msg: errorMessage,
+    });
+  };
+
+  /**
+   * Validates the chain ID by checking it against the `eth_chainId` return
+   * value from the given RPC URL.
+   * Assumes that all strings are non-empty and correctly formatted.
+   *
+   * @param {string} formChainId - Non-empty, hex or decimal number string from
+   * the form.
+   * @param {string} parsedChainId - The parsed, hex string chain ID.
+   * @param {string} formRpcUrl - The RPC URL from the form.
+   */
+  const validateChainIdOnSubmit = async (
+    formChainId,
+    parsedChainId,
+    formRpcUrl,
+  ) => {
+    let errorKey;
+    let errorMessage;
+    let endpointChainId;
+    let providerError;
+
+    try {
+      endpointChainId = await jsonRpcRequest(formRpcUrl, 'eth_chainId');
+    } catch (err) {
+      log.warn('Failed to fetch the chainId from the endpoint.', err);
+      providerError = err;
+    }
+
+    if (providerError || typeof endpointChainId !== 'string') {
+      errorKey = 'failedToFetchChainId';
+      errorMessage = t('failedToFetchChainId');
+    } else if (parsedChainId !== endpointChainId) {
+      // Here, we are in an error state. The endpoint should always return a
+      // hexadecimal string. If the user entered a decimal string, we attempt
+      // to convert the endpoint's return value to decimal before rendering it
+      // in an error message in the form.
+      if (!formChainId.startsWith('0x')) {
+        try {
+          endpointChainId = parseInt(endpointChainId, 16).toString(10);
+        } catch (err) {
+          log.warn(
+            'Failed to convert endpoint chain ID to decimal',
+            endpointChainId,
+          );
+        }
+      }
+
+      errorKey = 'endpointReturnedDifferentChainId';
+      errorMessage = t('endpointReturnedDifferentChainId', [
+        endpointChainId.length <= 12
+          ? endpointChainId
+          : `${endpointChainId.slice(0, 9)}...`,
+      ]);
+    }
+
+    if (errorKey) {
+      setErrorTo('chainId', {
+        key: errorKey,
+        msg: errorMessage,
+      });
+      return false;
+    }
+
+    setErrorEmpty('chainId');
+    return true;
+  };
+
+  const validateBlockExplorerURL = (url) => {
+    if (!validUrl.isWebUri(url) && url !== '') {
+      let errorKey;
+      let errorMessage;
+
+      if (isValidWhenAppended(url)) {
+        errorKey = 'urlErrorMsg';
+        errorMessage = t('urlErrorMsg');
+      } else {
+        errorKey = 'invalidBlockExplorerURL';
+        errorMessage = t('invalidBlockExplorerURL');
+      }
+
+      setErrorTo('blockExplorerUrl', {
+        key: errorKey,
+        msg: errorMessage,
+      });
+    } else {
+      setErrorEmpty('blockExplorerUrl');
+    }
+  };
+
+  const validateUrlRpcUrl = (url) => {
+    const isValidUrl = validUrl.isWebUri(url);
+    const chainIdFetchFailed = hasError('chainId', 'failedToFetchChainId');
+    const [matchingRPCUrl] = networksToRender.filter((e) => e.rpcUrl === url);
+
+    if (!isValidUrl && url !== '') {
+      let errorKey;
+      let errorMessage;
+      if (isValidWhenAppended(url)) {
+        errorKey = 'urlErrorMsg';
+        errorMessage = t('urlErrorMsg');
+      } else {
+        errorKey = 'invalidRPC';
+        errorMessage = t('invalidRPC');
+      }
+      setErrorTo('rpcUrl', {
+        key: errorKey,
+        msg: errorMessage,
+      });
+    } else if (matchingRPCUrl) {
+      setErrorTo('rpcUrl', {
+        key: 'urlExistsErrorMsg',
+        msg: t('urlExistsErrorMsg', [
+          matchingRPCUrl.label ?? matchingRPCUrl.labelKey,
+        ]),
+      });
+    } else {
+      setErrorEmpty('rpcUrl');
+    }
+
+    // Re-validate the chain id if it could not be found with previous rpc url
+    if (chainId && isValidUrl && chainIdFetchFailed) {
+      const formChainId = chainId.trim().toLowerCase();
+      const prefixedChainId = prefixChainId(formChainId);
+      validateChainIdOnSubmit(formChainId, prefixedChainId, url);
+    }
+  };
+
+  const onSubmit = async () => {
+    setIsSubmitting(true);
+    try {
+      const formChainId = chainId.trim().toLowerCase();
+      const prefixedChainId = prefixChainId(formChainId);
+
+      if (
+        !(await validateChainIdOnSubmit(formChainId, prefixedChainId, rpcUrl))
+      ) {
+        setIsSubmitting(false);
+        return;
+      }
+
+      // After this point, isSubmitting will be reset in componentDidUpdate
+      if (selectedNetwork.rpcUrl && rpcUrl !== selectedNetwork.rpcUrl) {
+        await dispatch(
+          editRpc(
+            selectedNetwork.rpcUrl,
+            rpcUrl,
+            prefixedChainId,
+            ticker,
+            networkName,
+            {
+              ...rpcPrefs,
+              blockExplorerUrl: blockExplorerUrl || rpcPrefs.blockExplorerUrl,
+            },
+          ),
+        );
+      } else {
+        await dispatch(
+          updateAndSetCustomRpc(rpcUrl, prefixedChainId, ticker, networkName, {
+            ...rpcPrefs,
+            blockExplorerUrl: blockExplorerUrl || rpcPrefs?.blockExplorerUrl,
+          }),
+        );
+      }
+
+      if (addNewNetwork) {
+        dispatch(setNewNetworkAdded(networkName));
+        history.push(DEFAULT_ROUTE);
+      }
+    } catch (error) {
+      setIsSubmitting(false);
+      throw error;
+    }
+  };
+
+  const onCancel = () => {
+    if (addNewNetwork) {
+      dispatch(setSelectedSettingsRpcUrl(''));
+      history.push(NETWORKS_ROUTE);
+    } else {
+      resetForm();
+    }
+  };
+
+  const onDelete = () => {
+    dispatch(
+      showModal({
+        name: 'CONFIRM_DELETE_NETWORK',
+        target: selectedNetwork.rpcUrl,
+        onConfirm: () => {
+          resetForm();
+          dispatch(setSelectedSettingsRpcUrl(''));
+          history.push(NETWORKS_ROUTE);
+        },
+      }),
+    );
+  };
+  const deletable = !isCurrentRpcTarget && !viewOnly && !addNewNetwork;
+  const stateUnchanged = stateIsUnchanged();
+  const isSubmitDisabled =
+    hasErrors() || isSubmitting || stateUnchanged || !rpcUrl || !chainId;
+
+  return (
+    <div
+      className={classnames({
+        'networks-tab__network-form': !addNewNetwork,
+        'networks-tab__add-network-form': addNewNetwork,
+      })}
+    >
+      {addNewNetwork ? (
+        <ActionableMessage
+          type="warning"
+          message={t('onlyAddTrustedNetworks')}
+          iconFillColor="#f8c000"
+          useIcon
+          withRightButton
+        />
+      ) : null}
+      <div
+        className={classnames({
+          'networks-tab__network-form-body': !addNewNetwork,
+          'networks-tab__network-form-body__view-only': viewOnly,
+          'networks-tab__add-network-form-body': addNewNetwork,
+        })}
+      >
+        <FormField
+          autoFocus
+          error={errors.networkName?.msg || ''}
+          onChange={setNetworkName}
+          titleText={t('networkName')}
+          value={networkName}
+          disabled={viewOnly}
+        />
+        <FormField
+          error={errors.rpcUrl?.msg || ''}
+          onChange={(value) => {
+            setRpcUrl(value);
+            validateUrlRpcUrl(value);
+          }}
+          titleText={t('rpcUrl')}
+          value={rpcUrl}
+          disabled={viewOnly}
+        />
+        <FormField
+          error={errors.chainId?.msg || ''}
+          onChange={(value) => {
+            setChainId(value);
+            validateChainIdOnChange(value);
+          }}
+          titleText={t('chainId')}
+          value={chainId}
+          disabled={viewOnly}
+          tooltipText={viewOnly ? null : t('networkSettingsChainIdDescription')}
+        />
+        <FormField
+          error={errors.ticker?.msg || ''}
+          onChange={setTicker}
+          titleText={t('currencySymbol')}
+          titleUnit={t('optionalWithParanthesis')}
+          value={ticker}
+          disabled={viewOnly}
+        />
+        <FormField
+          error={errors.blockExplorerUrl?.msg || ''}
+          onChange={(value) => {
+            setBlockExplorerUrl(value);
+            validateBlockExplorerURL(value);
+          }}
+          titleText={t('blockExplorerUrl')}
+          titleUnit={t('optionalWithParanthesis')}
+          value={blockExplorerUrl}
+          disabled={viewOnly}
+        />
+      </div>
+      <div
+        className={classnames({
+          'networks-tab__network-form-footer': !addNewNetwork,
+          'networks-tab__add-network-form-footer': addNewNetwork,
+        })}
+      >
+        {!viewOnly && (
+          <>
+            {deletable && (
+              <Button type="danger" onClick={onDelete}>
+                {t('delete')}
+              </Button>
+            )}
+            <Button
+              type="secondary"
+              onClick={onCancel}
+              disabled={stateUnchanged}
+            >
+              {t('cancel')}
+            </Button>
+            <Button
+              type="primary"
+              disabled={isSubmitDisabled}
+              onClick={onSubmit}
+            >
+              {t('save')}
+            </Button>
+          </>
+        )}
+      </div>
+    </div>
+  );
+};
+
+NetworksForm.propTypes = {
+  addNewNetwork: PropTypes.bool,
+  isCurrentRpcTarget: PropTypes.bool,
+  networksToRender: PropTypes.array.isRequired,
+  selectedNetwork: PropTypes.object,
+};
+
+NetworksForm.defaultProps = {
+  selectedNetwork: {},
+};
+
+export default NetworksForm;
diff --git a/ui/pages/settings/networks-tab/networks-form/networks-form.test.js b/ui/pages/settings/networks-tab/networks-form/networks-form.test.js
new file mode 100644
index 000000000..611716f02
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.test.js
@@ -0,0 +1,111 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../../../test/jest/rendering';
+import { defaultNetworksData } from '../networks-tab.constants';
+import NetworksForm from '.';
+
+const renderComponent = (props) => {
+  const store = configureMockStore([])({ metamask: {} });
+  return renderWithProvider(<NetworksForm {...props} />, store);
+};
+
+const defaultNetworks = defaultNetworksData.map((network) => ({
+  ...network,
+  viewOnly: true,
+}));
+
+const propNewNetwork = {
+  networksToRender: defaultNetworks,
+  addNewNetwork: true,
+};
+
+const propNetworkDisplay = {
+  selectedNetwork: {
+    rpcUrl: 'http://localhost:8545',
+    chainId: '1337',
+    ticker: 'ETH',
+    label: 'LocalHost',
+    blockExplorerUrl: '',
+    viewOnly: false,
+    rpcPrefs: {},
+  },
+  isCurrentRpcTarget: false,
+  networksToRender: defaultNetworks,
+  addNewNetwork: false,
+};
+
+describe('NetworkForm Component', () => {
+  it('should render Add new network form correctly', () => {
+    const { queryByText, queryAllByText } = renderComponent(propNewNetwork);
+    expect(
+      queryByText(
+        'A malicious network provider can lie about the state of the blockchain and record your network activity. Only add custom networks you trust.',
+      ),
+    ).toBeInTheDocument();
+    expect(queryByText('Network Name')).toBeInTheDocument();
+    expect(queryByText('New RPC URL')).toBeInTheDocument();
+    expect(queryByText('Chain ID')).toBeInTheDocument();
+    expect(queryByText('Currency Symbol')).toBeInTheDocument();
+    expect(queryByText('Block Explorer URL')).toBeInTheDocument();
+    expect(queryAllByText('(Optional)')).toHaveLength(2);
+    expect(queryByText('Cancel')).toBeInTheDocument();
+    expect(queryByText('Save')).toBeInTheDocument();
+  });
+
+  it('should render network form correctly', () => {
+    const { queryByText, getByDisplayValue } = renderComponent(
+      propNetworkDisplay,
+    );
+    expect(queryByText('Network Name')).toBeInTheDocument();
+    expect(queryByText('New RPC URL')).toBeInTheDocument();
+    expect(queryByText('Chain ID')).toBeInTheDocument();
+    expect(queryByText('Currency Symbol')).toBeInTheDocument();
+    expect(queryByText('Block Explorer URL')).toBeInTheDocument();
+    expect(queryByText('Delete')).toBeInTheDocument();
+    expect(queryByText('Cancel')).toBeInTheDocument();
+    expect(queryByText('Save')).toBeInTheDocument();
+
+    expect(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.label),
+    ).toBeInTheDocument();
+    expect(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.rpcUrl),
+    ).toBeInTheDocument();
+    expect(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.chainId),
+    ).toBeInTheDocument();
+    expect(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.ticker),
+    ).toBeInTheDocument();
+    expect(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.blockExplorerUrl),
+    ).toBeInTheDocument();
+    fireEvent.change(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.label),
+      {
+        target: { value: 'LocalHost 8545' },
+      },
+    );
+    expect(getByDisplayValue('LocalHost 8545')).toBeInTheDocument();
+    fireEvent.change(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.chainId),
+      {
+        target: { value: '1' },
+      },
+    );
+    expect(
+      queryByText('This Chain ID is currently used by the mainnet network.'),
+    ).toBeInTheDocument();
+
+    fireEvent.change(
+      getByDisplayValue(propNetworkDisplay.selectedNetwork.rpcUrl),
+      {
+        target: { value: 'test' },
+      },
+    );
+    expect(
+      queryByText('URLs require the appropriate HTTP/HTTPS prefix.'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/settings/networks-tab/networks-list-item/index.js b/ui/pages/settings/networks-tab/networks-list-item/index.js
new file mode 100644
index 000000000..e4911213c
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-list-item/index.js
@@ -0,0 +1 @@
+export { default } from './networks-list-item';
diff --git a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
new file mode 100644
index 000000000..378afe584
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
@@ -0,0 +1,81 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { NETWORK_TYPE_RPC } from '../../../../../shared/constants/network';
+import { SIZES } from '../../../../helpers/constants/design-system';
+import ColorIndicator from '../../../../components/ui/color-indicator';
+import LockIcon from '../../../../components/ui/lock-icon';
+import { NETWORKS_FORM_ROUTE } from '../../../../helpers/constants/routes';
+import { setSelectedSettingsRpcUrl } from '../../../../store/actions';
+import { getEnvironmentType } from '../../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../../shared/constants/app';
+import { getProvider } from '../../../../selectors';
+
+const NetworksListItem = ({ network, networkIsSelected, selectedRpcUrl }) => {
+  const t = useI18nContext();
+  const history = useHistory();
+  const dispatch = useDispatch();
+  const environmentType = getEnvironmentType();
+  const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
+  const provider = useSelector(getProvider);
+  const {
+    label,
+    labelKey,
+    rpcUrl,
+    providerType: currentProviderType,
+  } = network;
+
+  const listItemNetworkIsSelected = selectedRpcUrl && selectedRpcUrl === rpcUrl;
+  const listItemUrlIsProviderUrl = rpcUrl === provider.rpcUrl;
+  const listItemTypeIsProviderNonRpcType =
+    provider.type !== NETWORK_TYPE_RPC && currentProviderType === provider.type;
+  const listItemNetworkIsCurrentProvider =
+    !networkIsSelected &&
+    (listItemUrlIsProviderUrl || listItemTypeIsProviderNonRpcType);
+  const displayNetworkListItemAsSelected =
+    listItemNetworkIsSelected || listItemNetworkIsCurrentProvider;
+
+  return (
+    <div
+      key={`settings-network-list-item:${rpcUrl}`}
+      className="networks-tab__networks-list-item"
+      onClick={() => {
+        dispatch(setSelectedSettingsRpcUrl(rpcUrl));
+        if (!isFullScreen) {
+          history.push(NETWORKS_FORM_ROUTE);
+        }
+      }}
+    >
+      <ColorIndicator
+        color={labelKey}
+        type={ColorIndicator.TYPES.FILLED}
+        size={SIZES.LG}
+      />
+      <div
+        className={classnames('networks-tab__networks-list-name', {
+          'networks-tab__networks-list-name--selected': displayNetworkListItemAsSelected,
+          'networks-tab__networks-list-name--disabled':
+            currentProviderType !== NETWORK_TYPE_RPC &&
+            !displayNetworkListItemAsSelected,
+        })}
+      >
+        {label || t(labelKey)}
+        {currentProviderType !== NETWORK_TYPE_RPC && (
+          <LockIcon width="14px" height="17px" fill="#cdcdcd" />
+        )}
+      </div>
+      <div className="networks-tab__networks-list-arrow" />
+    </div>
+  );
+};
+
+NetworksListItem.propTypes = {
+  network: PropTypes.object.isRequired,
+  networkIsSelected: PropTypes.bool,
+  selectedRpcUrl: PropTypes.string,
+};
+
+export default NetworksListItem;
diff --git a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js
new file mode 100644
index 000000000..975a86458
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.test.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../../test/jest/rendering';
+import { defaultNetworksData } from '../networks-tab.constants';
+import NetworksListItem from '.';
+
+const mockState = {
+  metamask: {
+    provider: {
+      chainId: '0x4',
+      nickname: '',
+      rpcPrefs: {},
+      rpcUrl: 'https://rinkeby.infura.io/v3/undefined',
+      ticker: 'ETH',
+      type: 'rinkeby',
+    },
+  },
+};
+
+const renderComponent = (props) => {
+  const store = configureMockStore([])(mockState);
+  return renderWithProvider(<NetworksListItem {...props} />, store);
+};
+
+const defaultNetworks = defaultNetworksData.map((network) => ({
+  ...network,
+  viewOnly: true,
+}));
+
+const MainnetProps = {
+  network: defaultNetworks[0],
+  networkIsSelected: false,
+  selectedRpcUrl: 'http://localhost:8545',
+};
+const testNetProps = {
+  network: defaultNetworks[1],
+  networkIsSelected: false,
+  selectedRpcUrl: 'http://localhost:8545',
+};
+
+describe('NetworksListItem Component', () => {
+  it('should render a Mainnet network item correctly', () => {
+    const { queryByText } = renderComponent(MainnetProps);
+    expect(queryByText('Ethereum Mainnet')).toBeInTheDocument();
+  });
+
+  it('should render a test network item correctly', () => {
+    const { queryByText } = renderComponent(testNetProps);
+    expect(queryByText('Ropsten Test Network')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/settings/networks-tab/networks-list/index.js b/ui/pages/settings/networks-tab/networks-list/index.js
new file mode 100644
index 000000000..bc1690fac
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-list/index.js
@@ -0,0 +1 @@
+export { default } from './networks-list';
diff --git a/ui/pages/settings/networks-tab/networks-list/networks-list.js b/ui/pages/settings/networks-tab/networks-list/networks-list.js
new file mode 100644
index 000000000..26be55938
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-list/networks-list.js
@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import NetworksListItem from '../networks-list-item';
+
+const NetworksList = ({
+  networkIsSelected,
+  networksToRender,
+  networkDefaultedToProvider,
+  selectedRpcUrl,
+}) => {
+  return (
+    <div
+      className={classnames('networks-tab__networks-list', {
+        'networks-tab__networks-list--selection':
+          networkIsSelected && !networkDefaultedToProvider,
+      })}
+    >
+      {networksToRender.map((network) => (
+        <NetworksListItem
+          key={`settings-network-list:${network.rpcUrl}`}
+          network={network}
+          networkIsSelected={networkIsSelected}
+          selectedRpcUrl={selectedRpcUrl}
+        />
+      ))}
+    </div>
+  );
+};
+
+NetworksList.propTypes = {
+  networkDefaultedToProvider: PropTypes.bool,
+  networkIsSelected: PropTypes.bool,
+  networksToRender: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectedRpcUrl: PropTypes.string,
+};
+
+export default NetworksList;
diff --git a/ui/pages/settings/networks-tab/networks-list/networks-list.test.js b/ui/pages/settings/networks-tab/networks-list/networks-list.test.js
new file mode 100644
index 000000000..fcb04e7be
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-list/networks-list.test.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../../test/jest/rendering';
+import { defaultNetworksData } from '../networks-tab.constants';
+import NetworksList from '.';
+
+const mockState = {
+  metamask: {
+    provider: {
+      chainId: '0x4',
+      nickname: '',
+      rpcPrefs: {},
+      rpcUrl: 'https://rinkeby.infura.io/v3/undefined',
+      ticker: 'ETH',
+      type: 'rinkeby',
+    },
+  },
+};
+
+const renderComponent = (props) => {
+  const store = configureMockStore([])(mockState);
+  return renderWithProvider(<NetworksList {...props} />, store);
+};
+
+const defaultNetworks = defaultNetworksData.map((network) => ({
+  ...network,
+  viewOnly: true,
+}));
+
+const props = {
+  networkDefaultedToProvider: false,
+  networkIsSelected: false,
+  networksToRender: defaultNetworks,
+  selectedRpcUrl: 'http://localhost:8545',
+};
+
+describe('NetworksList Component', () => {
+  it('should render a list of networks correctly', () => {
+    const { queryByText } = renderComponent(props);
+
+    expect(queryByText('Ethereum Mainnet')).toBeInTheDocument();
+    expect(queryByText('Ropsten Test Network')).toBeInTheDocument();
+    expect(queryByText('Rinkeby Test Network')).toBeInTheDocument();
+    expect(queryByText('Goerli Test Network')).toBeInTheDocument();
+    expect(queryByText('Kovan Test Network')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/settings/networks-tab/networks-tab-content/index.js b/ui/pages/settings/networks-tab/networks-tab-content/index.js
new file mode 100644
index 000000000..960698aac
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab-content/index.js
@@ -0,0 +1 @@
+export { default } from './networks-tab-content';
diff --git a/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.js b/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.js
new file mode 100644
index 000000000..313bc0ff5
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+import NetworksForm from '../networks-form';
+import NetworksList from '../networks-list';
+import { getProvider } from '../../../../selectors';
+
+const NetworksTabContent = ({
+  networkDefaultedToProvider,
+  networkIsSelected,
+  networksToRender,
+  selectedNetwork,
+  shouldRenderNetworkForm,
+}) => {
+  const provider = useSelector(getProvider);
+
+  return (
+    <>
+      <NetworksList
+        networkDefaultedToProvider={networkDefaultedToProvider}
+        networkIsSelected={networkIsSelected}
+        networksToRender={networksToRender}
+        selectedRpcUrl={selectedNetwork.rpcUrl}
+      />
+      {shouldRenderNetworkForm ? (
+        <NetworksForm
+          isCurrentRpcTarget={provider.rpcUrl === selectedNetwork.rpcUrl}
+          networksToRender={networksToRender}
+          selectedNetwork={selectedNetwork}
+        />
+      ) : null}
+    </>
+  );
+};
+NetworksTabContent.propTypes = {
+  networkDefaultedToProvider: PropTypes.bool,
+  networkIsSelected: PropTypes.bool,
+  networksToRender: PropTypes.arrayOf(PropTypes.object).isRequired,
+  selectedNetwork: PropTypes.object,
+  shouldRenderNetworkForm: PropTypes.bool.isRequired,
+};
+
+export default NetworksTabContent;
diff --git a/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js b/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js
new file mode 100644
index 000000000..7239b744a
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab-content/networks-tab-content.test.js
@@ -0,0 +1,92 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { fireEvent } from '@testing-library/react';
+import { renderWithProvider } from '../../../../../test/jest/rendering';
+import { defaultNetworksData } from '../networks-tab.constants';
+import NetworksTabContent from '.';
+
+const mockState = {
+  metamask: {
+    provider: {
+      chainId: '0x539',
+      nickname: '',
+      rpcPrefs: {},
+      rpcUrl: 'http://localhost:8545',
+      ticker: 'ETH',
+      type: 'localhost',
+    },
+  },
+};
+
+const renderComponent = (props) => {
+  const store = configureMockStore([])(mockState);
+  return renderWithProvider(<NetworksTabContent {...props} />, store);
+};
+
+const defaultNetworks = defaultNetworksData.map((network) => ({
+  ...network,
+  viewOnly: true,
+}));
+
+const props = {
+  networkDefaultedToProvider: false,
+  networkIsSelected: true,
+  networksToRender: defaultNetworks,
+  selectedNetwork: {
+    rpcUrl: 'http://localhost:8545',
+    chainId: '1337',
+    ticker: 'ETH',
+    label: 'LocalHost',
+    blockExplorerUrl: '',
+    viewOnly: false,
+    rpcPrefs: {},
+  },
+  shouldRenderNetworkForm: true,
+};
+
+describe('NetworksTabContent Component', () => {
+  it('should render networks tab content correctly', () => {
+    const { queryByText, getByDisplayValue } = renderComponent(props);
+
+    expect(queryByText('Ethereum Mainnet')).toBeInTheDocument();
+    expect(queryByText('Ropsten Test Network')).toBeInTheDocument();
+    expect(queryByText('Rinkeby Test Network')).toBeInTheDocument();
+    expect(queryByText('Goerli Test Network')).toBeInTheDocument();
+    expect(queryByText('Kovan Test Network')).toBeInTheDocument();
+
+    expect(queryByText('Network Name')).toBeInTheDocument();
+    expect(queryByText('New RPC URL')).toBeInTheDocument();
+    expect(queryByText('Chain ID')).toBeInTheDocument();
+    expect(queryByText('Currency Symbol')).toBeInTheDocument();
+    expect(queryByText('Block Explorer URL')).toBeInTheDocument();
+    expect(queryByText('Cancel')).toBeInTheDocument();
+    expect(queryByText('Save')).toBeInTheDocument();
+
+    expect(getByDisplayValue(props.selectedNetwork.label)).toBeInTheDocument();
+    expect(getByDisplayValue(props.selectedNetwork.rpcUrl)).toBeInTheDocument();
+    expect(
+      getByDisplayValue(props.selectedNetwork.chainId),
+    ).toBeInTheDocument();
+    expect(getByDisplayValue(props.selectedNetwork.ticker)).toBeInTheDocument();
+    expect(
+      getByDisplayValue(props.selectedNetwork.blockExplorerUrl),
+    ).toBeInTheDocument();
+    fireEvent.change(getByDisplayValue(props.selectedNetwork.label), {
+      target: { value: 'LocalHost 8545' },
+    });
+    expect(getByDisplayValue('LocalHost 8545')).toBeInTheDocument();
+    fireEvent.change(getByDisplayValue(props.selectedNetwork.chainId), {
+      target: { value: '1' },
+    });
+    expect(
+      queryByText('This Chain ID is currently used by the mainnet network.'),
+    ).toBeInTheDocument();
+
+    fireEvent.change(getByDisplayValue(props.selectedNetwork.rpcUrl), {
+      target: { value: 'test' },
+    });
+    expect(
+      queryByText('URLs require the appropriate HTTP/HTTPS prefix.'),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/settings/networks-tab/networks-tab-subheader/index.js b/ui/pages/settings/networks-tab/networks-tab-subheader/index.js
new file mode 100644
index 000000000..a097baaa1
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab-subheader/index.js
@@ -0,0 +1 @@
+export { default } from './networks-tab-subheader';
diff --git a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
new file mode 100644
index 000000000..1420e3082
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useHistory } from 'react-router-dom';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { ADD_NETWORK_ROUTE } from '../../../../helpers/constants/routes';
+import Button from '../../../../components/ui/button';
+
+const NetworksFormSubheader = ({ addNewNetwork }) => {
+  const t = useI18nContext();
+  const history = useHistory();
+  return addNewNetwork ? (
+    <div className="networks-tab__subheader">
+      <span className="networks-tab__sub-header-text">{t('networks')}</span>
+      <span>{'  >  '}</span>
+      <div className="networks-tab__subheader--break">{t('addANetwork')}</div>
+    </div>
+  ) : (
+    <div className="settings-page__sub-header">
+      <span className="settings-page__sub-header-text">{t('networks')}</span>
+      <div className="networks-tab__add-network-header-button-wrapper">
+        <Button
+          type="primary"
+          onClick={(event) => {
+            event.preventDefault();
+            history.push(ADD_NETWORK_ROUTE);
+          }}
+        >
+          {t('addANetwork')}
+        </Button>
+      </div>
+    </div>
+  );
+};
+
+NetworksFormSubheader.propTypes = {
+  addNewNetwork: PropTypes.bool.isRequired,
+};
+
+export default NetworksFormSubheader;
diff --git a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
new file mode 100644
index 000000000..099261049
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
@@ -0,0 +1,46 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../../test/jest/rendering';
+import NetworksTabSubheader from '.';
+
+const mockState = {
+  metamask: {
+    provider: {
+      chainId: '0x539',
+      nickname: '',
+      rpcPrefs: {},
+      rpcUrl: 'http://localhost:8545',
+      ticker: 'ETH',
+      type: 'localhost',
+    },
+    frequentRpcListDetail: [],
+  },
+  appState: {
+    networksTabSelectedRpcUrl: 'http://localhost:8545',
+  },
+};
+
+const renderComponent = (props) => {
+  const store = configureMockStore([])(mockState);
+  return renderWithProvider(<NetworksTabSubheader {...props} />, store);
+};
+
+describe('NetworksTabSubheader Component', () => {
+  it('should render network subheader correctly', () => {
+    const { queryByText, getByRole } = renderComponent({
+      addNewNetwork: false,
+    });
+
+    expect(queryByText('Networks')).toBeInTheDocument();
+    expect(queryByText('Add a network')).toBeInTheDocument();
+    expect(getByRole('button', { text: 'Add a network' })).toBeDefined();
+  });
+  it('should render add network form subheader correctly', () => {
+    const { queryByText } = renderComponent({
+      addNewNetwork: true,
+    });
+    expect(queryByText('Networks')).toBeInTheDocument();
+    expect(queryByText('>')).toBeInTheDocument();
+    expect(queryByText('Add a network')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/settings/networks-tab/networks-tab.component.js b/ui/pages/settings/networks-tab/networks-tab.component.js
deleted file mode 100644
index 4a943f0e3..000000000
--- a/ui/pages/settings/networks-tab/networks-tab.component.js
+++ /dev/null
@@ -1,269 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { NETWORK_TYPE_RPC } from '../../../../shared/constants/network';
-import Button from '../../../components/ui/button';
-import LockIcon from '../../../components/ui/lock-icon';
-import {
-  NETWORKS_ROUTE,
-  NETWORKS_FORM_ROUTE,
-  DEFAULT_ROUTE,
-} from '../../../helpers/constants/routes';
-import ColorIndicator from '../../../components/ui/color-indicator';
-import { COLORS, SIZES } from '../../../helpers/constants/design-system';
-import NetworkForm from './network-form';
-
-export default class NetworksTab extends PureComponent {
-  static contextTypes = {
-    t: PropTypes.func.isRequired,
-    metricsEvent: PropTypes.func.isRequired,
-  };
-
-  static propTypes = {
-    editRpc: PropTypes.func.isRequired,
-    location: PropTypes.object.isRequired,
-    networkIsSelected: PropTypes.bool,
-    networksTabIsInAddMode: PropTypes.bool,
-    networksToRender: PropTypes.arrayOf(PropTypes.object).isRequired,
-    selectedNetwork: PropTypes.object,
-    setNetworksTabAddMode: PropTypes.func.isRequired,
-    setRpcTarget: PropTypes.func.isRequired,
-    setSelectedSettingsRpcUrl: PropTypes.func.isRequired,
-    showConfirmDeleteNetworkModal: PropTypes.func.isRequired,
-    providerUrl: PropTypes.string,
-    providerType: PropTypes.string,
-    networkDefaultedToProvider: PropTypes.bool,
-    history: PropTypes.object.isRequired,
-    shouldRenderNetworkForm: PropTypes.bool.isRequired,
-    isFullScreen: PropTypes.bool.isRequired,
-  };
-
-  componentWillUnmount() {
-    this.props.setSelectedSettingsRpcUrl('');
-  }
-
-  isCurrentPath(pathname) {
-    return this.props.location.pathname === pathname;
-  }
-
-  renderSubHeader() {
-    const { setSelectedSettingsRpcUrl, setNetworksTabAddMode } = this.props;
-
-    return (
-      <div className="settings-page__sub-header">
-        <span className="settings-page__sub-header-text">
-          {this.context.t('networks')}
-        </span>
-        <div className="networks-tab__add-network-header-button-wrapper">
-          <Button
-            type="primary"
-            onClick={(event) => {
-              event.preventDefault();
-              setSelectedSettingsRpcUrl('');
-              setNetworksTabAddMode(true);
-            }}
-          >
-            {this.context.t('addNetwork')}
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  renderNetworkListItem(network, selectRpcUrl) {
-    const {
-      setSelectedSettingsRpcUrl,
-      setNetworksTabAddMode,
-      networkIsSelected,
-      providerUrl,
-      providerType,
-      networksTabIsInAddMode,
-      history,
-      isFullScreen,
-    } = this.props;
-    const {
-      label,
-      labelKey,
-      rpcUrl,
-      providerType: currentProviderType,
-    } = network;
-
-    const listItemNetworkIsSelected = selectRpcUrl && selectRpcUrl === rpcUrl;
-    const listItemUrlIsProviderUrl = rpcUrl === providerUrl;
-    const listItemTypeIsProviderNonRpcType =
-      providerType !== NETWORK_TYPE_RPC && currentProviderType === providerType;
-    const listItemNetworkIsCurrentProvider =
-      !networkIsSelected &&
-      !networksTabIsInAddMode &&
-      (listItemUrlIsProviderUrl || listItemTypeIsProviderNonRpcType);
-    const displayNetworkListItemAsSelected =
-      listItemNetworkIsSelected || listItemNetworkIsCurrentProvider;
-
-    return (
-      <div
-        key={`settings-network-list-item:${rpcUrl}`}
-        className="networks-tab__networks-list-item"
-        onClick={() => {
-          setNetworksTabAddMode(false);
-          setSelectedSettingsRpcUrl(rpcUrl);
-          if (!isFullScreen) {
-            history.push(NETWORKS_FORM_ROUTE);
-          }
-        }}
-      >
-        <ColorIndicator
-          color={labelKey}
-          type={ColorIndicator.TYPES.FILLED}
-          size={SIZES.LG}
-        />
-        <div
-          className={classnames('networks-tab__networks-list-name', {
-            'networks-tab__networks-list-name--selected': displayNetworkListItemAsSelected,
-            'networks-tab__networks-list-name--disabled':
-              currentProviderType !== NETWORK_TYPE_RPC &&
-              !displayNetworkListItemAsSelected,
-          })}
-        >
-          {label || this.context.t(labelKey)}
-          {currentProviderType !== NETWORK_TYPE_RPC && (
-            <LockIcon width="14px" height="17px" fill="#cdcdcd" />
-          )}
-        </div>
-        <div className="networks-tab__networks-list-arrow" />
-      </div>
-    );
-  }
-
-  renderNetworksList() {
-    const {
-      networksToRender,
-      selectedNetwork,
-      networkIsSelected,
-      networksTabIsInAddMode,
-      networkDefaultedToProvider,
-    } = this.props;
-
-    return (
-      <div
-        className={classnames('networks-tab__networks-list', {
-          'networks-tab__networks-list--selection':
-            (networkIsSelected && !networkDefaultedToProvider) ||
-            networksTabIsInAddMode,
-        })}
-      >
-        {networksToRender.map((network) =>
-          this.renderNetworkListItem(network, selectedNetwork.rpcUrl),
-        )}
-        {networksTabIsInAddMode && (
-          <div className="networks-tab__networks-list-item">
-            <ColorIndicator
-              type={ColorIndicator.TYPES.FILLED}
-              color={COLORS.WHITE}
-              borderColor={COLORS.UI4}
-              size={SIZES.LG}
-            />
-            <div className="networks-tab__networks-list-name networks-tab__networks-list-name--selected">
-              {this.context.t('newNetwork')}
-            </div>
-            <div className="networks-tab__networks-list-arrow" />
-          </div>
-        )}
-      </div>
-    );
-  }
-
-  renderNetworksTabContent() {
-    const { t } = this.context;
-    const {
-      setRpcTarget,
-      showConfirmDeleteNetworkModal,
-      setSelectedSettingsRpcUrl,
-      setNetworksTabAddMode,
-      selectedNetwork: {
-        labelKey,
-        label,
-        rpcUrl,
-        chainId,
-        ticker,
-        viewOnly,
-        rpcPrefs,
-        blockExplorerUrl,
-      },
-      networksTabIsInAddMode,
-      editRpc,
-      providerUrl,
-      networksToRender,
-      history,
-      isFullScreen,
-      shouldRenderNetworkForm,
-    } = this.props;
-
-    return (
-      <>
-        {this.renderNetworksList()}
-        {shouldRenderNetworkForm ? (
-          <NetworkForm
-            setRpcTarget={setRpcTarget}
-            editRpc={editRpc}
-            networkName={label || (labelKey && t(labelKey)) || ''}
-            rpcUrl={rpcUrl}
-            chainId={chainId}
-            networksToRender={networksToRender}
-            ticker={ticker}
-            onClear={(shouldUpdateHistory = true) => {
-              setNetworksTabAddMode(false);
-              setSelectedSettingsRpcUrl('');
-              if (shouldUpdateHistory) {
-                history.push(NETWORKS_ROUTE);
-              }
-            }}
-            onAddNetwork={() => {
-              history.push(DEFAULT_ROUTE);
-            }}
-            showConfirmDeleteNetworkModal={showConfirmDeleteNetworkModal}
-            viewOnly={viewOnly}
-            isCurrentRpcTarget={providerUrl === rpcUrl}
-            networksTabIsInAddMode={networksTabIsInAddMode}
-            rpcPrefs={rpcPrefs}
-            blockExplorerUrl={blockExplorerUrl}
-            isFullScreen={isFullScreen}
-          />
-        ) : null}
-      </>
-    );
-  }
-
-  render() {
-    const {
-      setNetworksTabAddMode,
-      setSelectedSettingsRpcUrl,
-      history,
-      isFullScreen,
-      shouldRenderNetworkForm,
-    } = this.props;
-
-    return (
-      <div className="networks-tab__body">
-        {isFullScreen ? this.renderSubHeader() : null}
-        <div className="networks-tab__content">
-          {this.renderNetworksTabContent()}
-          {!isFullScreen && !shouldRenderNetworkForm ? (
-            <div className="networks-tab__networks-list-popup-footer">
-              <Button
-                type="primary"
-                onClick={(event) => {
-                  event.preventDefault();
-                  setSelectedSettingsRpcUrl('');
-                  setNetworksTabAddMode(true);
-                  history.push(NETWORKS_FORM_ROUTE);
-                }}
-              >
-                {this.context.t('addNetwork')}
-              </Button>
-            </div>
-          ) : null}
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/ui/pages/settings/networks-tab/networks-tab.constants.js b/ui/pages/settings/networks-tab/networks-tab.constants.js
index 26a57c7bd..d5ad83541 100644
--- a/ui/pages/settings/networks-tab/networks-tab.constants.js
+++ b/ui/pages/settings/networks-tab/networks-tab.constants.js
@@ -5,6 +5,9 @@ import {
   KOVAN,
   KOVAN_CHAIN_ID,
   KOVAN_RPC_URL,
+  LOCALHOST,
+  LOCALHOST_CHAIN_ID,
+  LOCALHOST_RPC_URL,
   MAINNET,
   MAINNET_CHAIN_ID,
   MAINNET_RPC_URL,
@@ -62,6 +65,15 @@ const defaultNetworksData = [
     ticker: 'ETH',
     blockExplorerUrl: 'https://kovan.etherscan.io',
   },
+  {
+    labelKey: LOCALHOST,
+    iconColor: '#29B6AF',
+    providerType: LOCALHOST,
+    rpcUrl: LOCALHOST_RPC_URL,
+    chainId: LOCALHOST_CHAIN_ID,
+    ticker: 'ETH',
+    blockExplorerUrl: '',
+  },
 ];
 
 export { defaultNetworksData };
diff --git a/ui/pages/settings/networks-tab/networks-tab.container.js b/ui/pages/settings/networks-tab/networks-tab.container.js
deleted file mode 100644
index 2878cbf11..000000000
--- a/ui/pages/settings/networks-tab/networks-tab.container.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import { compose } from 'redux';
-import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
-import {
-  setSelectedSettingsRpcUrl,
-  updateAndSetCustomRpc,
-  displayWarning,
-  setNetworksTabAddMode,
-  editRpc,
-  showModal,
-} from '../../../store/actions';
-import { NETWORKS_FORM_ROUTE } from '../../../helpers/constants/routes';
-import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
-import { NETWORK_TYPE_RPC } from '../../../../shared/constants/network';
-import { getEnvironmentType } from '../../../../app/scripts/lib/util';
-import NetworksTab from './networks-tab.component';
-import { defaultNetworksData } from './networks-tab.constants';
-
-const defaultNetworks = defaultNetworksData.map((network) => ({
-  ...network,
-  viewOnly: true,
-}));
-
-const mapStateToProps = (state, ownProps) => {
-  const {
-    location: { pathname },
-  } = ownProps;
-
-  const environmentType = getEnvironmentType();
-  const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
-  const shouldRenderNetworkForm =
-    isFullScreen || Boolean(pathname.match(NETWORKS_FORM_ROUTE));
-
-  const { frequentRpcListDetail, provider } = state.metamask;
-  const { networksTabSelectedRpcUrl, networksTabIsInAddMode } = state.appState;
-
-  const frequentRpcNetworkListDetails = frequentRpcListDetail.map((rpc) => {
-    return {
-      label: rpc.nickname,
-      iconColor: '#6A737D',
-      providerType: NETWORK_TYPE_RPC,
-      rpcUrl: rpc.rpcUrl,
-      chainId: rpc.chainId,
-      ticker: rpc.ticker,
-      blockExplorerUrl: rpc.rpcPrefs?.blockExplorerUrl || '',
-    };
-  });
-
-  const networksToRender = [
-    ...defaultNetworks,
-    ...frequentRpcNetworkListDetails,
-  ];
-  let selectedNetwork =
-    networksToRender.find(
-      (network) => network.rpcUrl === networksTabSelectedRpcUrl,
-    ) || {};
-  const networkIsSelected = Boolean(selectedNetwork.rpcUrl);
-
-  let networkDefaultedToProvider = false;
-  if (!networkIsSelected && !networksTabIsInAddMode) {
-    selectedNetwork =
-      networksToRender.find((network) => {
-        return (
-          network.rpcUrl === provider.rpcUrl ||
-          (network.providerType !== NETWORK_TYPE_RPC &&
-            network.providerType === provider.type)
-        );
-      }) || {};
-    networkDefaultedToProvider = true;
-  }
-
-  return {
-    selectedNetwork,
-    networksToRender,
-    networkIsSelected,
-    networksTabIsInAddMode,
-    providerType: provider.type,
-    providerUrl: provider.rpcUrl,
-    networkDefaultedToProvider,
-    isFullScreen,
-    shouldRenderNetworkForm,
-  };
-};
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    setSelectedSettingsRpcUrl: (newRpcUrl) =>
-      dispatch(setSelectedSettingsRpcUrl(newRpcUrl)),
-    setRpcTarget: (newRpc, chainId, ticker, nickname, rpcPrefs) => {
-      return dispatch(
-        updateAndSetCustomRpc(newRpc, chainId, ticker, nickname, rpcPrefs),
-      );
-    },
-    showConfirmDeleteNetworkModal: ({ target, onConfirm }) => {
-      return dispatch(
-        showModal({ name: 'CONFIRM_DELETE_NETWORK', target, onConfirm }),
-      );
-    },
-    displayWarning: (warning) => dispatch(displayWarning(warning)),
-    setNetworksTabAddMode: (isInAddMode) =>
-      dispatch(setNetworksTabAddMode(isInAddMode)),
-    editRpc: (oldRpc, newRpc, chainId, ticker, nickname, rpcPrefs) => {
-      return dispatch(
-        editRpc(oldRpc, newRpc, chainId, ticker, nickname, rpcPrefs),
-      );
-    },
-  };
-};
-
-export default compose(
-  withRouter,
-  connect(mapStateToProps, mapDispatchToProps),
-)(NetworksTab);
diff --git a/ui/pages/settings/networks-tab/networks-tab.js b/ui/pages/settings/networks-tab/networks-tab.js
new file mode 100644
index 000000000..fed8adea5
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab.js
@@ -0,0 +1,129 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { useLocation } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  ADD_NETWORK_ROUTE,
+  NETWORKS_FORM_ROUTE,
+} from '../../../helpers/constants/routes';
+import { setSelectedSettingsRpcUrl } from '../../../store/actions';
+import Button from '../../../components/ui/button';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
+import {
+  getFrequentRpcListDetail,
+  getNetworksTabSelectedRpcUrl,
+  getProvider,
+} from '../../../selectors';
+import { NETWORK_TYPE_RPC } from '../../../../shared/constants/network';
+import { defaultNetworksData } from './networks-tab.constants';
+import NetworksTabContent from './networks-tab-content';
+import NetworksForm from './networks-form';
+import NetworksFormSubheader from './networks-tab-subheader';
+
+const defaultNetworks = defaultNetworksData.map((network) => ({
+  ...network,
+  viewOnly: true,
+}));
+
+const NetworksTab = ({ addNewNetwork }) => {
+  const t = useI18nContext();
+  const dispatch = useDispatch();
+  const { pathname } = useLocation();
+
+  const environmentType = getEnvironmentType();
+  const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
+  const shouldRenderNetworkForm =
+    isFullScreen || Boolean(pathname.match(NETWORKS_FORM_ROUTE));
+
+  const frequentRpcListDetail = useSelector(getFrequentRpcListDetail);
+  const provider = useSelector(getProvider);
+  const networksTabSelectedRpcUrl = useSelector(getNetworksTabSelectedRpcUrl);
+
+  const frequentRpcNetworkListDetails = frequentRpcListDetail.map((rpc) => {
+    return {
+      label: rpc.nickname,
+      iconColor: '#6A737D',
+      providerType: NETWORK_TYPE_RPC,
+      rpcUrl: rpc.rpcUrl,
+      chainId: rpc.chainId,
+      ticker: rpc.ticker,
+      blockExplorerUrl: rpc.rpcPrefs?.blockExplorerUrl || '',
+    };
+  });
+
+  const networksToRender = [
+    ...defaultNetworks,
+    ...frequentRpcNetworkListDetails,
+  ];
+  let selectedNetwork =
+    networksToRender.find(
+      (network) => network.rpcUrl === networksTabSelectedRpcUrl,
+    ) || {};
+  const networkIsSelected = Boolean(selectedNetwork.rpcUrl);
+
+  let networkDefaultedToProvider = false;
+  if (!networkIsSelected) {
+    selectedNetwork =
+      networksToRender.find((network) => {
+        return (
+          network.rpcUrl === provider.rpcUrl ||
+          (network.providerType !== NETWORK_TYPE_RPC &&
+            network.providerType === provider.type)
+        );
+      }) || {};
+    networkDefaultedToProvider = true;
+  }
+
+  useEffect(() => {
+    return () => {
+      dispatch(setSelectedSettingsRpcUrl(''));
+    };
+  }, [dispatch]);
+
+  return (
+    <div className="networks-tab__body">
+      {isFullScreen ? (
+        <NetworksFormSubheader addNewNetwork={addNewNetwork} />
+      ) : null}
+      <div className="networks-tab__content">
+        {addNewNetwork ? (
+          <NetworksForm
+            networksToRender={networksToRender}
+            addNewNetwork={addNewNetwork}
+          />
+        ) : (
+          <>
+            <NetworksTabContent
+              networkDefaultedToProvider={networkDefaultedToProvider}
+              networkIsSelected={networkIsSelected}
+              networksToRender={networksToRender}
+              providerUrl={provider.rpcUrl}
+              selectedNetwork={selectedNetwork}
+              shouldRenderNetworkForm={shouldRenderNetworkForm}
+            />
+            {!isFullScreen && !shouldRenderNetworkForm ? (
+              <div className="networks-tab__networks-list-popup-footer">
+                <Button
+                  type="primary"
+                  onClick={(event) => {
+                    event.preventDefault();
+                    global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE);
+                  }}
+                >
+                  {t('addNetwork')}
+                </Button>
+              </div>
+            ) : null}
+          </>
+        )}
+      </div>
+    </div>
+  );
+};
+
+NetworksTab.propTypes = {
+  addNewNetwork: PropTypes.bool,
+};
+export default NetworksTab;
diff --git a/ui/pages/settings/networks-tab/networks-tab.test.js b/ui/pages/settings/networks-tab/networks-tab.test.js
new file mode 100644
index 000000000..2c5d96002
--- /dev/null
+++ b/ui/pages/settings/networks-tab/networks-tab.test.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../test/jest/rendering';
+import NetworksTab from '.';
+
+const mockState = {
+  metamask: {
+    provider: {
+      chainId: '0x539',
+      nickname: '',
+      rpcPrefs: {},
+      rpcUrl: 'http://localhost:8545',
+      ticker: 'ETH',
+      type: 'localhost',
+    },
+    frequentRpcListDetail: [],
+  },
+  appState: {
+    networksTabSelectedRpcUrl: 'http://localhost:8545',
+  },
+};
+
+const renderComponent = (props) => {
+  const store = configureMockStore([])(mockState);
+  return renderWithProvider(<NetworksTab {...props} />, store);
+};
+
+describe('NetworksTab Component', () => {
+  it('should render networks tab content correctly', () => {
+    const { queryByText } = renderComponent({
+      addNewNetwork: false,
+    });
+
+    expect(queryByText('Ethereum Mainnet')).toBeInTheDocument();
+    expect(queryByText('Ropsten Test Network')).toBeInTheDocument();
+    expect(queryByText('Rinkeby Test Network')).toBeInTheDocument();
+    expect(queryByText('Goerli Test Network')).toBeInTheDocument();
+    expect(queryByText('Kovan Test Network')).toBeInTheDocument();
+    expect(queryByText('Add Network')).toBeInTheDocument();
+  });
+  it('should render add network form correctly', () => {
+    const { queryByText } = renderComponent({
+      addNewNetwork: true,
+    });
+    expect(queryByText('Network Name')).toBeInTheDocument();
+    expect(queryByText('New RPC URL')).toBeInTheDocument();
+    expect(queryByText('Chain ID')).toBeInTheDocument();
+    expect(queryByText('Currency Symbol')).toBeInTheDocument();
+    expect(queryByText('Block Explorer URL')).toBeInTheDocument();
+    expect(queryByText('Cancel')).toBeInTheDocument();
+    expect(queryByText('Save')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index c9f694c1c..00ed38505 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -16,6 +16,7 @@ import {
   CONTACT_EDIT_ROUTE,
   CONTACT_VIEW_ROUTE,
   EXPERIMENTAL_ROUTE,
+  ADD_NETWORK_ROUTE,
 } from '../../helpers/constants/routes';
 import SettingsTab from './settings-tab';
 import AlertsTab from './alerts-tab';
@@ -39,6 +40,7 @@ class SettingsPage extends PureComponent {
     breadCrumbTextKey: PropTypes.string,
     initialBreadCrumbKey: PropTypes.string,
     mostRecentOverviewPage: PropTypes.string.isRequired,
+    addNewNetwork: PropTypes.bool,
   };
 
   static contextTypes = {
@@ -51,6 +53,7 @@ class SettingsPage extends PureComponent {
       backRoute,
       currentPath,
       mostRecentOverviewPage,
+      addNewNetwork,
     } = this.props;
 
     return (
@@ -69,7 +72,13 @@ class SettingsPage extends PureComponent {
           {this.renderTitle()}
           <div
             className="settings-page__close-button"
-            onClick={() => history.push(mostRecentOverviewPage)}
+            onClick={() => {
+              if (addNewNetwork) {
+                history.push(NETWORKS_ROUTE);
+              } else {
+                history.push(mostRecentOverviewPage);
+              }
+            }}
           />
         </div>
         <div className="settings-page__content">
@@ -92,7 +101,7 @@ class SettingsPage extends PureComponent {
     let titleText;
 
     if (isPopup && addressName) {
-      titleText = addressName;
+      titleText = t('details');
     } else if (pathnameI18nKey && isPopup) {
       titleText = t(pathnameI18nKey);
     } else {
@@ -222,6 +231,11 @@ class SettingsPage extends PureComponent {
         <Route exact path={ABOUT_US_ROUTE} component={InfoTab} />
         <Route exact path={ADVANCED_ROUTE} component={AdvancedTab} />
         <Route exact path={ALERTS_ROUTE} component={AlertsTab} />
+        <Route
+          exact
+          path={ADD_NETWORK_ROUTE}
+          render={() => <NetworksTab addNewNetwork />}
+        />
         <Route path={NETWORKS_ROUTE} component={NetworksTab} />
         <Route exact path={SECURITY_ROUTE} component={SecurityTab} />
         <Route exact path={EXPERIMENTAL_ROUTE} component={ExperimentalTab} />
diff --git a/ui/pages/settings/settings.container.js b/ui/pages/settings/settings.container.js
index 4ac2f456c..c973e78f3 100644
--- a/ui/pages/settings/settings.container.js
+++ b/ui/pages/settings/settings.container.js
@@ -1,7 +1,7 @@
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
-import { getAddressBookEntryName } from '../../selectors';
+import { getAddressBookEntryOrAccountName } from '../../selectors';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../shared/constants/app';
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
@@ -24,6 +24,7 @@ import {
   SECURITY_ROUTE,
   SETTINGS_ROUTE,
   EXPERIMENTAL_ROUTE,
+  ADD_NETWORK_ROUTE,
 } from '../../helpers/constants/routes';
 import Settings from './settings.component';
 
@@ -38,6 +39,7 @@ const ROUTES_TO_I18N_KEYS = {
   [CONTACT_VIEW_ROUTE]: 'viewContact',
   [NETWORKS_ROUTE]: 'networks',
   [NETWORKS_FORM_ROUTE]: 'networks',
+  [ADD_NETWORK_ROUTE]: 'networks',
   [SECURITY_ROUTE]: 'securityAndPrivacy',
   [EXPERIMENTAL_ROUTE]: 'experimental',
 };
@@ -50,7 +52,10 @@ const mapStateToProps = (state, ownProps) => {
   const isAddressEntryPage = pathNameTail.includes('0x');
   const isAddContactPage = Boolean(pathname.match(CONTACT_ADD_ROUTE));
   const isEditContactPage = Boolean(pathname.match(CONTACT_EDIT_ROUTE));
-  const isNetworksFormPage = Boolean(pathname.match(NETWORKS_FORM_ROUTE));
+  const isNetworksFormPage =
+    Boolean(pathname.match(NETWORKS_FORM_ROUTE)) ||
+    Boolean(pathname.match(ADD_NETWORK_ROUTE));
+  const addNewNetwork = Boolean(pathname.match(ADD_NETWORK_ROUTE));
 
   const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
   const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname];
@@ -67,7 +72,7 @@ const mapStateToProps = (state, ownProps) => {
   let initialBreadCrumbRoute;
   let initialBreadCrumbKey;
 
-  const addressName = getAddressBookEntryName(
+  const addressName = getAddressBookEntryOrAccountName(
     state,
     !isBurnAddress(pathNameTail) &&
       isValidHexAddress(pathNameTail, { mixedCaseUseChecksum: true })
@@ -85,6 +90,7 @@ const mapStateToProps = (state, ownProps) => {
     initialBreadCrumbRoute,
     initialBreadCrumbKey,
     mostRecentOverviewPage: getMostRecentOverviewPage(state),
+    addNewNetwork,
   };
 };
 
diff --git a/ui/pages/settings/settings.stories.js b/ui/pages/settings/settings.stories.js
new file mode 100644
index 000000000..c05953a76
--- /dev/null
+++ b/ui/pages/settings/settings.stories.js
@@ -0,0 +1,78 @@
+import React from 'react';
+
+import PropTypes from 'prop-types';
+import { withRouter, MemoryRouter } from 'react-router-dom';
+import {
+  ABOUT_US_ROUTE,
+  ADVANCED_ROUTE,
+  ALERTS_ROUTE,
+  CONTACT_LIST_ROUTE,
+  CONTACT_ADD_ROUTE,
+  CONTACT_EDIT_ROUTE,
+  CONTACT_VIEW_ROUTE,
+  GENERAL_ROUTE,
+  NETWORKS_FORM_ROUTE,
+  NETWORKS_ROUTE,
+  SECURITY_ROUTE,
+  SETTINGS_ROUTE,
+} from '../../helpers/constants/routes';
+import SettingsPage from './settings.component';
+
+export default {
+  title: 'SettingPage',
+  id: __filename,
+  decorators: [
+    (story) => (
+      <MemoryRouter initialEntries={['/settings/general']}>
+        {story()}
+      </MemoryRouter>
+    ),
+  ],
+};
+
+const ROUTES_TO_I18N_KEYS = {
+  [ABOUT_US_ROUTE]: 'about',
+  [ADVANCED_ROUTE]: 'advanced',
+  [ALERTS_ROUTE]: 'alerts',
+  [GENERAL_ROUTE]: 'general',
+  [CONTACT_ADD_ROUTE]: 'newContact',
+  [CONTACT_EDIT_ROUTE]: 'editContact',
+  [CONTACT_LIST_ROUTE]: 'contacts',
+  [CONTACT_VIEW_ROUTE]: 'viewContact',
+  [NETWORKS_ROUTE]: 'networks',
+  [NETWORKS_FORM_ROUTE]: 'networks',
+  [SECURITY_ROUTE]: 'securityAndPrivacy',
+};
+
+global.platform = {
+  getVersion: () => 'V3.14.159',
+};
+
+const Settings = ({ history }) => {
+  const { location } = history;
+  const pathname =
+    location.pathname === '/iframe.html'
+      ? '/settings/general'
+      : location.pathname;
+
+  const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname];
+  const backRoute = SETTINGS_ROUTE;
+
+  return (
+    <div style={{ height: 500 }}>
+      <SettingsPage
+        currentPath={pathname}
+        mostRecentOverviewPage={pathname}
+        history={history}
+        pathnameI18nKey={pathnameI18nKey}
+        backRoute={backRoute}
+      />
+    </div>
+  );
+};
+
+Settings.propTypes = {
+  history: PropTypes.object,
+};
+
+export const SettingsPageComponent = withRouter(Settings);
diff --git a/ui/pages/swaps/fee-card/fee-card.test.js b/ui/pages/swaps/fee-card/fee-card.test.js
index 9327ad69e..ffa54affe 100644
--- a/ui/pages/swaps/fee-card/fee-card.test.js
+++ b/ui/pages/swaps/fee-card/fee-card.test.js
@@ -17,6 +17,7 @@ import {
   MOCKS,
 } from '../../../../test/jest';
 import { MAINNET_CHAIN_ID } from '../../../../shared/constants/network';
+import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../helpers/constants/transactions';
 import FeeCard from '.';
 
 const middleware = [thunk];
@@ -35,7 +36,7 @@ const generateUseSelectorRouter = () => (selector) => {
     return true;
   }
   if (selector === getGasEstimateType) {
-    return 'fee-market';
+    return TRANSACTION_ENVELOPE_TYPE_NAMES.FEE_MARKET;
   }
   if (selector === getGasFeeEstimates) {
     return MOCKS.createGasFeeEstimatesForFeeMarket();
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 034f7ee0e..2e67e465f 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
@@ -51,6 +51,7 @@ exports[`MainQuoteSummary renders the component with initial props 3`] = `
       class=""
       style="display: inline;"
       tabindex="0"
+      title=""
     >
       <span
         class="main-quote-summary__quote-large-number"
diff --git a/ui/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js b/ui/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js
index dc3c32285..d0f21cfe0 100644
--- a/ui/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js
+++ b/ui/pages/swaps/swaps-gas-customization-modal/swaps-gas-customization-modal.component.js
@@ -7,6 +7,7 @@ import { sumHexWEIsToUnformattedFiat } from '../../../helpers/utils/conversions.
 import AdvancedGasInputs from '../../../components/app/gas-customization/advanced-gas-inputs';
 import BasicTabContent from '../../../components/app/gas-customization/gas-modal-page-container/basic-tab-content';
 import { GAS_ESTIMATE_TYPES } from '../../../helpers/constants/common';
+import { CUSTOM_GAS_ESTIMATE } from '../../../../shared/constants/gas';
 
 export default class GasModalPageContainer extends Component {
   static contextTypes = {
@@ -99,11 +100,11 @@ export default class GasModalPageContainer extends Component {
           <div className="advanced-tab__gas-inputs">
             <AdvancedGasInputs
               updateCustomGasPrice={(updatedPrice) => {
-                this.setState({ gasSpeedType: 'custom' });
+                this.setState({ gasSpeedType: CUSTOM_GAS_ESTIMATE });
                 setSwapsCustomizationModalPrice(updatedPrice);
               }}
               updateCustomGasLimit={(updatedLimit) => {
-                this.setState({ gasSpeedType: 'custom' });
+                this.setState({ gasSpeedType: CUSTOM_GAS_ESTIMATE });
                 setSwapsCustomizationModalLimit(updatedLimit);
               }}
               customGasPrice={customGasPrice}
diff --git a/ui/pages/swaps/view-quote/view-quote-price-difference.js b/ui/pages/swaps/view-quote/view-quote-price-difference.js
index af73963e1..343083ce5 100644
--- a/ui/pages/swaps/view-quote/view-quote-price-difference.js
+++ b/ui/pages/swaps/view-quote/view-quote-price-difference.js
@@ -11,6 +11,7 @@ import {
   JUSTIFY_CONTENT,
   DISPLAY,
 } from '../../../helpers/constants/design-system';
+import { GAS_RECOMMENDATIONS } from '../../../../shared/constants/gas';
 
 export default function ViewQuotePriceDifference(props) {
   const {
@@ -35,7 +36,7 @@ export default function ViewQuotePriceDifference(props) {
     // A calculation error signals we cannot determine dollar value
     priceDifferenceTitle = t('swapPriceUnavailableTitle');
     priceDifferenceMessage = t('swapPriceUnavailableDescription');
-    priceDifferenceClass = 'high';
+    priceDifferenceClass = GAS_RECOMMENDATIONS.HIGH;
     priceDifferenceAcknowledgementText = t('tooltipApproveButton');
   } else {
     priceDifferenceTitle = t('swapPriceDifferenceTitle', [
diff --git a/ui/pages/swaps/view-quote/view-quote-price-difference.test.js b/ui/pages/swaps/view-quote/view-quote-price-difference.test.js
index cd94ab4a0..085cb8ea2 100644
--- a/ui/pages/swaps/view-quote/view-quote-price-difference.test.js
+++ b/ui/pages/swaps/view-quote/view-quote-price-difference.test.js
@@ -3,6 +3,7 @@ import { shallow } from 'enzyme';
 import { Provider } from 'react-redux';
 import configureMockStore from 'redux-mock-store';
 import { NETWORK_TYPE_RPC } from '../../../../shared/constants/network';
+import { GAS_RECOMMENDATIONS } from '../../../../shared/constants/gas';
 import ViewQuotePriceDifference from './view-quote-price-difference';
 
 describe('View Price Quote Difference', () => {
@@ -48,7 +49,7 @@ describe('View Price Quote Difference', () => {
       priceSlippage: {
         ratio: 1.007876641534847,
         calculationError: '',
-        bucket: 'low',
+        bucket: GAS_RECOMMENDATIONS.LOW,
         sourceAmountInETH: 1,
         destinationAmountInETH: 0.9921849150875727,
       },
@@ -113,7 +114,7 @@ describe('View Price Quote Difference', () => {
 
   it('does not render when the item is in the low bucket', () => {
     const props = { ...DEFAULT_PROPS };
-    props.usedQuote.priceSlippage.bucket = 'low';
+    props.usedQuote.priceSlippage.bucket = GAS_RECOMMENDATIONS.LOW;
 
     renderComponent(props);
     const wrappingDiv = component.find(
@@ -124,18 +125,18 @@ describe('View Price Quote Difference', () => {
 
   it('displays an error when in medium bucket', () => {
     const props = { ...DEFAULT_PROPS };
-    props.usedQuote.priceSlippage.bucket = 'medium';
+    props.usedQuote.priceSlippage.bucket = GAS_RECOMMENDATIONS.MEDIUM;
 
     renderComponent(props);
-    expect(component.html()).toContain('medium');
+    expect(component.html()).toContain(GAS_RECOMMENDATIONS.MEDIUM);
   });
 
   it('displays an error when in high bucket', () => {
     const props = { ...DEFAULT_PROPS };
-    props.usedQuote.priceSlippage.bucket = 'high';
+    props.usedQuote.priceSlippage.bucket = GAS_RECOMMENDATIONS.HIGH;
 
     renderComponent(props);
-    expect(component.html()).toContain('high');
+    expect(component.html()).toContain(GAS_RECOMMENDATIONS.HIGH);
   });
 
   it('displays a fiat error when calculationError is present', () => {
@@ -144,6 +145,6 @@ describe('View Price Quote Difference', () => {
       'Could not determine price.';
 
     renderComponent(props);
-    expect(component.html()).toContain('high');
+    expect(component.html()).toContain(GAS_RECOMMENDATIONS.HIGH);
   });
 });
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index f64fc185b..7ec692c80 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -93,7 +93,10 @@ import {
 } from '../swaps.util';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { QUOTES_EXPIRED_ERROR } from '../../../../shared/constants/swaps';
-import { EDIT_GAS_MODES } from '../../../../shared/constants/gas';
+import {
+  EDIT_GAS_MODES,
+  GAS_RECOMMENDATIONS,
+} from '../../../../shared/constants/gas';
 import CountdownTimer from '../countdown-timer';
 import SwapsFooter from '../swaps-footer';
 import ViewQuotePriceDifference from './view-quote-price-difference';
@@ -117,7 +120,10 @@ export default function ViewQuote() {
     acknowledgedPriceDifference,
     setAcknowledgedPriceDifference,
   ] = useState(false);
-  const priceDifferenceRiskyBuckets = ['high', 'medium'];
+  const priceDifferenceRiskyBuckets = [
+    GAS_RECOMMENDATIONS.HIGH,
+    GAS_RECOMMENDATIONS.MEDIUM,
+  ];
 
   const routeState = useSelector(getBackgroundSwapRouteState);
   const quotes = useSelector(getQuotes, isEqual);
@@ -163,8 +169,8 @@ export default function ViewQuote() {
   if (networkAndAccountSupports1559) {
     // For Swaps we want to get 'high' estimations by default.
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    gasFeeInputs = useGasFeeInputs('high', {
-      userFeeLevel: swapsUserFeeLevel || 'high',
+    gasFeeInputs = useGasFeeInputs(GAS_RECOMMENDATIONS.HIGH, {
+      userFeeLevel: swapsUserFeeLevel || GAS_RECOMMENDATIONS.HIGH,
     });
   }
 
@@ -592,8 +598,8 @@ export default function ViewQuote() {
   useEffect(() => {
     if (
       acknowledgedPriceDifference &&
-      lastPriceDifferenceBucket === 'medium' &&
-      priceSlippageBucket === 'high'
+      lastPriceDifferenceBucket === GAS_RECOMMENDATIONS.MEDIUM &&
+      priceSlippageBucket === GAS_RECOMMENDATIONS.HIGH
     ) {
       setAcknowledgedPriceDifference(false);
     }
@@ -695,7 +701,7 @@ export default function ViewQuote() {
         {showEditGasPopover && networkAndAccountSupports1559 && (
           <EditGasPopover
             transaction={{
-              userFeeLevel: swapsUserFeeLevel || 'high',
+              userFeeLevel: swapsUserFeeLevel || GAS_RECOMMENDATIONS.HIGH,
               txParams: {
                 maxFeePerGas,
                 maxPriorityFeePerGas,
@@ -703,7 +709,7 @@ export default function ViewQuote() {
               },
             }}
             minimumGasLimit={usedGasLimit}
-            defaultEstimateToUse="high"
+            defaultEstimateToUse={GAS_RECOMMENDATIONS.HIGH}
             mode={EDIT_GAS_MODES.SWAPS}
             confirmButtonText={t('submit')}
             onClose={onCloseEditGasPopover}
diff --git a/ui/pages/unlock-page/unlock-page.component.js b/ui/pages/unlock-page/unlock-page.component.js
index 907cda27c..f7323d4c4 100644
--- a/ui/pages/unlock-page/unlock-page.component.js
+++ b/ui/pages/unlock-page/unlock-page.component.js
@@ -123,7 +123,6 @@ export default class UnlockPage extends Component {
         type="submit"
         style={style}
         disabled={!this.state.password}
-        fullWidth
         variant="contained"
         size="large"
         onClick={this.handleSubmit}
diff --git a/ui/selectors/confirm-transaction.js b/ui/selectors/confirm-transaction.js
index 3dcfe8e05..2f1d9d193 100644
--- a/ui/selectors/confirm-transaction.js
+++ b/ui/selectors/confirm-transaction.js
@@ -17,7 +17,10 @@ import {
 } from '../ducks/metamask/metamask';
 import { TRANSACTION_ENVELOPE_TYPES } from '../../shared/constants/transaction';
 import { decGWEIToHexWEI } from '../helpers/utils/conversions.util';
-import { GAS_ESTIMATE_TYPES } from '../../shared/constants/gas';
+import {
+  GAS_ESTIMATE_TYPES,
+  CUSTOM_GAS_ESTIMATE,
+} from '../../shared/constants/gas';
 import {
   getMaximumGasTotalInHexWei,
   getMinimumGasTotalInHexWei,
@@ -258,12 +261,13 @@ export const transactionFeeSelector = function (state, txData) {
       } = selectedGasEstimates;
       gasEstimationObject.maxFeePerGas =
         txData.txParams?.maxFeePerGas &&
-        (txData.userFeeLevel === 'custom' || !suggestedMaxFeePerGas)
+        (txData.userFeeLevel === CUSTOM_GAS_ESTIMATE || !suggestedMaxFeePerGas)
           ? txData.txParams?.maxFeePerGas
           : decGWEIToHexWEI(suggestedMaxFeePerGas || gasPrice);
       gasEstimationObject.maxPriorityFeePerGas =
         txData.txParams?.maxPriorityFeePerGas &&
-        (txData.userFeeLevel === 'custom' || !suggestedMaxPriorityFeePerGas)
+        (txData.userFeeLevel === CUSTOM_GAS_ESTIMATE ||
+          !suggestedMaxPriorityFeePerGas)
           ? txData.txParams?.maxPriorityFeePerGas
           : (suggestedMaxPriorityFeePerGas &&
               decGWEIToHexWEI(suggestedMaxPriorityFeePerGas)) ||
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 3f4642342..cc8283262 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -153,6 +153,7 @@ export function getAccountType(state) {
   switch (type) {
     case KEYRING_TYPES.TREZOR:
     case KEYRING_TYPES.LEDGER:
+    case KEYRING_TYPES.LATTICE:
       return 'hardware';
     case 'Simple Key Pair':
       return 'imported';
@@ -309,10 +310,13 @@ export function getAddressBookEntry(state, address) {
   return entry;
 }
 
-export function getAddressBookEntryName(state, address) {
+export function getAddressBookEntryOrAccountName(state, address) {
   const entry =
-    getAddressBookEntry(state, address) || state.metamask.identities[address];
-  return entry && entry.name !== '' ? entry.name : shortenAddress(address);
+    getAddressBookEntry(state, address) ||
+    Object.values(state.metamask.identities).find((identity) =>
+      isEqualCaseInsensitive(identity.address, toChecksumHexAddress(address)),
+    );
+  return entry && entry.name !== '' ? entry.name : address;
 }
 
 export function accountsWithSendEtherInfoSelector(state) {
@@ -429,6 +433,11 @@ export function getPreferences({ metamask }) {
   return metamask.preferences;
 }
 
+export function getShowTestNetworks(state) {
+  const { showTestNetworks } = getPreferences(state);
+  return Boolean(showTestNetworks);
+}
+
 export function getShouldShowFiat(state) {
   const isMainNet = getIsMainnet(state);
   const conversionRate = getConversionRate(state);
@@ -674,6 +683,27 @@ export function doesAddressRequireLedgerHidConnection(state, address) {
   );
 }
 
+/**
+ * To retrieve the name of the new Network added using add network form
+ * @param {*} state
+ * @returns string
+ */
+export function getNewNetworkAdded(state) {
+  return state.appState.newNetworkAdded;
+}
+
+export function getNetworksTabSelectedRpcUrl(state) {
+  return state.appState.networksTabSelectedRpcUrl;
+}
+
+export function getProvider(state) {
+  return state.metamask.provider;
+}
+
+export function getFrequentRpcListDetail(state) {
+  return state.metamask.frequentRpcListDetail;
+}
+
 export function getIsOptimism(state) {
   return (
     getCurrentChainId(state) === OPTIMISM_CHAIN_ID ||
@@ -688,3 +718,23 @@ export function getNetworkSupportsSettingGasPrice(state) {
 export function getIsMultiLayerFeeNetwork(state) {
   return getIsOptimism(state);
 }
+/**
+ *  To retrieve the maxBaseFee and priotitFee teh user has set as default
+ *  @param {*} state
+ *  @returns Boolean
+ */
+export function getAdvancedGasFeeValues(state) {
+  return state.metamask.advancedGasFee;
+}
+
+/**
+ *  To check if the user has set advanced gas fee settings as default with a non empty  maxBaseFee and priotityFee.
+ *  @param {*} state
+ *  @returns Boolean
+ */
+export function getIsAdvancedGasFeeDefault(state) {
+  const { advancedGasFee } = state.metamask;
+  return (
+    Boolean(advancedGasFee?.maxBaseFee) && Boolean(advancedGasFee?.priorityFee)
+  );
+}
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index 798ef8680..9b587dc91 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -245,4 +245,17 @@ describe('Selectors', () => {
       },
     });
   });
+  it('#getAdvancedGasFeeValues', () => {
+    const advancedGasFee = selectors.getAdvancedGasFeeValues(mockState);
+    expect(advancedGasFee).toStrictEqual({
+      maxBaseFee: '1.5',
+      priorityFee: '2',
+    });
+  });
+  it('#getIsAdvancedGasFeeDefault', () => {
+    const isAdvancedGasFeeDefault = selectors.getIsAdvancedGasFeeDefault(
+      mockState,
+    );
+    expect(isAdvancedGasFeeDefault).toStrictEqual(true);
+  });
 });
diff --git a/ui/store/actionConstants.js b/ui/store/actionConstants.js
index b1724fad3..57e40f4bd 100644
--- a/ui/store/actionConstants.js
+++ b/ui/store/actionConstants.js
@@ -9,6 +9,8 @@ export const QR_CODE_DETECTED = 'UI_QR_CODE_DETECTED';
 // network dropdown open
 export const NETWORK_DROPDOWN_OPEN = 'UI_NETWORK_DROPDOWN_OPEN';
 export const NETWORK_DROPDOWN_CLOSE = 'UI_NETWORK_DROPDOWN_CLOSE';
+// network dropdown
+export const HIDE_TESTNET_MESSAGE = 'HIDE_TESTNET_MESSAGE';
 // remote state
 export const UPDATE_METAMASK_STATE = 'UPDATE_METAMASK_STATE';
 export const SELECTED_ADDRESS_CHANGED = 'SELECTED_ADDRESS_CHANGED';
@@ -89,7 +91,7 @@ export const CLEAR_PENDING_TOKENS = 'CLEAR_PENDING_TOKENS';
 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_NETWORKS_TAB_ADD_MODE = 'SET_NETWORKS_TAB_ADD_MODE';
+export const SET_NEW_NETWORK_ADDED = 'SET_NEW_NETWORK_ADDED';
 
 export const LOADING_METHOD_DATA_STARTED = 'LOADING_METHOD_DATA_STARTED';
 export const LOADING_METHOD_DATA_FINISHED = 'LOADING_METHOD_DATA_FINISHED';
diff --git a/ui/store/actions.js b/ui/store/actions.js
index d99ae68c6..d78703278 100644
--- a/ui/store/actions.js
+++ b/ui/store/actions.js
@@ -1658,6 +1658,12 @@ export function hideNetworkDropdown() {
   };
 }
 
+export function hideTestNetMessage() {
+  return {
+    type: actionConstants.HIDE_TESTNET_MESSAGE,
+  };
+}
+
 export function showModal(payload) {
   return {
     type: actionConstants.MODAL_OPEN,
@@ -1944,6 +1950,10 @@ export function setShowFiatConversionOnTestnetsPreference(value) {
   return setPreference('showFiatInTestnets', value);
 }
 
+export function setShowTestNetworks(value) {
+  return setPreference('showTestNetworks', value);
+}
+
 export function setAutoLockTimeLimit(value) {
   return setPreference('autoLockTimeLimit', value);
 }
@@ -2080,6 +2090,19 @@ export function setUseTokenDetection(val) {
   };
 }
 
+export function setAdvancedGasFee(val) {
+  return (dispatch) => {
+    dispatch(showLoadingIndication());
+    log.debug(`background.setAdvancedGasFee`);
+    background.setAdvancedGasFee(val, (err) => {
+      dispatch(hideLoadingIndication());
+      if (err) {
+        dispatch(displayWarning(err.message));
+      }
+    });
+  };
+}
+
 export function setIpfsGateway(val) {
   return (dispatch) => {
     dispatch(showLoadingIndication());
@@ -2459,10 +2482,10 @@ export function setSelectedSettingsRpcUrl(newRpcUrl) {
   };
 }
 
-export function setNetworksTabAddMode(isInAddMode) {
+export function setNewNetworkAdded(newNetworkAdded) {
   return {
-    type: actionConstants.SET_NETWORKS_TAB_ADD_MODE,
-    value: isInAddMode,
+    type: actionConstants.SET_NEW_NETWORK_ADDED,
+    value: newNetworkAdded,
   };
 }
 
@@ -2775,7 +2798,7 @@ export function getCurrentWindowTab() {
   };
 }
 
-export function setLedgerLivePreference(value) {
+export function setLedgerTransportPreference(value) {
   return async (dispatch) => {
     dispatch(showLoadingIndication());
     await promisifiedBackground.setLedgerTransportPreference(value);
diff --git a/yarn.lock b/yarn.lock
index 7be2ac596..92caf6047 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -62,6 +62,13 @@
   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":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
@@ -69,20 +76,6 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.5.5":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
-  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"
@@ -90,17 +83,29 @@
   dependencies:
     "@babel/highlight" "^7.12.13"
 
+"@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8", "@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.9.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.7.5":
+"@babel/core@7.12.9", "@babel/core@>=7.9.0", "@babel/core@^7.12.1", "@babel/core@^7.7.5":
   version "7.12.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
   integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
@@ -143,6 +148,27 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
+"@babel/core@^7.12.10":
+  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==
+  dependencies:
+    "@babel/code-frame" "^7.15.8"
+    "@babel/generator" "^7.15.8"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.8"
+    "@babel/helpers" "^7.15.4"
+    "@babel/parser" "^7.15.8"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.6"
+    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/eslint-parser@^7.13.14":
   version "7.13.14"
   resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.14.tgz#f80fd23bdd839537221914cb5d17720a5ea6ba3a"
@@ -159,6 +185,15 @@
   dependencies:
     eslint-rule-composer "^0.3.0"
 
+"@babel/generator@^7.12.11", "@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==
+  dependencies:
+    "@babel/types" "^7.15.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"
@@ -184,6 +219,13 @@
   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"
+  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
+  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"
@@ -192,6 +234,14 @@
     "@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"
+  integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
+  dependencies:
+    "@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"
@@ -219,6 +269,16 @@
     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"
+  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    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"
@@ -240,6 +300,18 @@
     "@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"
+  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@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"
@@ -248,6 +320,14 @@
     "@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"
+  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
+  dependencies:
+    "@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"
@@ -257,6 +337,34 @@
     "@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"
+  integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
+"@babel/helper-define-polyfill-provider@^0.2.2":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
+  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    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"
@@ -264,6 +372,13 @@
   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"
+  integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
+  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"
@@ -282,6 +397,15 @@
     "@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"
+  integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.15.4"
+    "@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"
@@ -296,6 +420,13 @@
   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"
+  integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
+  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"
@@ -303,6 +434,13 @@
   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"
+  integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
+  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"
@@ -317,6 +455,13 @@
   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"
+  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
+  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"
@@ -324,6 +469,13 @@
   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":
+  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"
@@ -360,6 +512,20 @@
     "@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":
+  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==
+  dependencies:
+    "@babel/helper-module-imports" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-simple-access" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/template" "^7.15.4"
+    "@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"
@@ -374,7 +540,14 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
-"@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-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"
+  integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
+  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":
   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==
@@ -384,6 +557,11 @@
   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":
+  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"
@@ -393,6 +571,15 @@
     "@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"
+  integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@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"
@@ -413,6 +600,16 @@
     "@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"
+  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@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"
@@ -427,6 +624,13 @@
   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"
+  integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
+  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"
@@ -434,6 +638,13 @@
   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"
+  integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
+  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"
@@ -448,6 +659,13 @@
   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"
+  integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
+  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"
@@ -463,6 +681,11 @@
   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":
+  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"
@@ -473,6 +696,11 @@
   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"
@@ -483,6 +711,16 @@
     "@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"
+  integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
+  dependencies:
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@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"
@@ -501,7 +739,16 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.8.3":
+"@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==
+  dependencies:
+    "@babel/template" "^7.15.4"
+    "@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==
@@ -519,6 +766,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@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==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
+    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"
@@ -539,11 +795,25 @@
   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":
+  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"
+  integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@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"
@@ -553,6 +823,15 @@
     "@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"
+  integrity sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@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"
@@ -561,14 +840,31 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f"
-  integrity sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ==
+"@babel/plugin-proposal-class-properties@^7.14.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==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-decorators" "^7.12.1"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-class-static-block@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
+  integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-proposal-decorators@^7.12.12":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.8.tgz#eb2969abf8993f15289f09fed762bb1df1521bd5"
+  integrity sha512-5n8+xGK7YDrXF+WAORg3P7LlCCdiaAyKLZi22eP2BwTy4kJ0kFUMMDCj4nQ8YrKyNZgjhU/9eRVqONnjB3us8g==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@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"
@@ -578,6 +874,14 @@
     "@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"
+  integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
 "@babel/plugin-proposal-export-default-from@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz#c6e62d668a8abcfe0d28b82f560395fecb611c5a"
@@ -594,6 +898,14 @@
     "@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"
+  integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
+  dependencies:
+    "@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"
@@ -602,6 +914,14 @@
     "@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"
+  integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
+  dependencies:
+    "@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"
@@ -610,6 +930,14 @@
     "@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"
+  integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
+  dependencies:
+    "@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"
@@ -618,6 +946,14 @@
     "@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":
+  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==
+  dependencies:
+    "@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"
@@ -626,7 +962,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
+"@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"
+  integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
+  dependencies:
+    "@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":
   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==
@@ -635,6 +979,17 @@
     "@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":
+  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==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@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"
@@ -643,7 +998,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.8.3":
+"@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"
+  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
+  dependencies:
+    "@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==
@@ -652,6 +1015,15 @@
     "@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":
+  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==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@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"
@@ -660,6 +1032,24 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@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==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-private-property-in-object@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
+  integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@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"
@@ -668,6 +1058,14 @@
     "@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":
+  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==
+  dependencies:
+    "@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":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -689,19 +1087,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-class-properties@^7.8.3":
+"@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"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-decorators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
-  integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-decorators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
+  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -745,13 +1150,20 @@
   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==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-jsx@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201"
+  integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
@@ -773,7 +1185,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
@@ -794,6 +1206,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+  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"
@@ -801,6 +1220,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  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"
@@ -808,12 +1234,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-typescript@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
-  integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==
+"@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"
+  integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-transform-arrow-functions@^7.12.1":
   version "7.12.1"
@@ -822,6 +1248,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@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"
@@ -831,6 +1264,15 @@
     "@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"
+  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.14.5"
+    "@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"
@@ -838,6 +1280,13 @@
   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"
+  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
+  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"
@@ -845,6 +1294,13 @@
   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"
+  integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
+  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"
@@ -859,6 +1315,19 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
+"@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==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@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"
@@ -866,6 +1335,13 @@
   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"
+  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
+  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"
@@ -873,6 +1349,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@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"
@@ -881,6 +1364,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-dotall-regex@^7.14.5":
+  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==
+  dependencies:
+    "@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"
@@ -888,6 +1379,13 @@
   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"
+  integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
+  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"
@@ -896,6 +1394,14 @@
     "@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"
+  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-flow-strip-types@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.1.tgz#8430decfa7eb2aea5414ed4a3fa6e1652b7d77c4"
@@ -911,6 +1417,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@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"
@@ -919,6 +1432,14 @@
     "@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"
+  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
+  dependencies:
+    "@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"
@@ -926,6 +1447,13 @@
   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"
+  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
+  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"
@@ -933,6 +1461,13 @@
   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"
+  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
+  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"
@@ -942,6 +1477,15 @@
     "@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"
+  integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@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"
@@ -952,6 +1496,16 @@
     "@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"
+  integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@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"
@@ -963,6 +1517,17 @@
     "@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"
+  integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@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"
@@ -971,6 +1536,14 @@
     "@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"
+  integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
+  dependencies:
+    "@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"
@@ -978,6 +1551,13 @@
   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"
+  integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
+  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"
@@ -985,6 +1565,13 @@
   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"
+  integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
+  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"
@@ -993,6 +1580,14 @@
     "@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"
+  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
+  dependencies:
+    "@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"
@@ -1000,6 +1595,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@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"
@@ -1007,6 +1609,13 @@
   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"
+  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
+  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"
@@ -1014,6 +1623,13 @@
   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"
+  integrity sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==
+  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"
@@ -1023,6 +1639,13 @@
     "@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"
+  integrity sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==
+  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"
@@ -1037,6 +1660,17 @@
   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"
+  integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@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"
@@ -1055,6 +1689,14 @@
     "@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"
+  integrity sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==
+  dependencies:
+    "@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"
@@ -1062,6 +1704,13 @@
   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"
+  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
+  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"
@@ -1069,6 +1718,13 @@
   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"
+  integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-runtime@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz#a6331afbfc59189d2135b2e09474457a8e3d28bc"
@@ -1086,6 +1742,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@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"
@@ -1094,6 +1757,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^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==
+  dependencies:
+    "@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"
@@ -1101,6 +1772,13 @@
   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"
+  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
+  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"
@@ -1108,6 +1786,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@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"
@@ -1115,14 +1800,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typescript@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
-  integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==
+"@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"
+  integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-typescript" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-typescript@^7.15.0":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.8.tgz#ff0e6a47de9b2d58652123ab5a879b2ff20665d8"
+  integrity sha512-ZXIkJpbaf6/EsmjeTbiJN/yMxWPFWvlr7sEG1P95Xb4S4IBcrf2n7s/fItIhsAmOf8oSh3VJPDppO6ExfAfKRQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@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"
@@ -1131,6 +1823,13 @@
   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"
+  integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
+  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"
@@ -1139,7 +1838,94 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/preset-env@^7.12.1", "@babel/preset-env@^7.5.5":
+"@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"
+  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/preset-env@^7.12.11":
+  version "7.15.8"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.8.tgz#f527ce5bcb121cd199f6b502bf23e420b3ff8dba"
+  integrity sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.15.8"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-class-static-block" "^7.15.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
+    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
+    "@babel/plugin-proposal-json-strings" "^7.14.5"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
+    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+    "@babel/plugin-proposal-private-methods" "^7.14.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.14.5"
+    "@babel/plugin-transform-async-to-generator" "^7.14.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
+    "@babel/plugin-transform-block-scoping" "^7.15.3"
+    "@babel/plugin-transform-classes" "^7.15.4"
+    "@babel/plugin-transform-computed-properties" "^7.14.5"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-dotall-regex" "^7.14.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
+    "@babel/plugin-transform-for-of" "^7.15.4"
+    "@babel/plugin-transform-function-name" "^7.14.5"
+    "@babel/plugin-transform-literals" "^7.14.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
+    "@babel/plugin-transform-modules-amd" "^7.14.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.15.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.15.4"
+    "@babel/plugin-transform-modules-umd" "^7.14.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
+    "@babel/plugin-transform-new-target" "^7.14.5"
+    "@babel/plugin-transform-object-super" "^7.14.5"
+    "@babel/plugin-transform-parameters" "^7.15.4"
+    "@babel/plugin-transform-property-literals" "^7.14.5"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-reserved-words" "^7.14.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
+    "@babel/plugin-transform-spread" "^7.15.8"
+    "@babel/plugin-transform-sticky-regex" "^7.14.5"
+    "@babel/plugin-transform-template-literals" "^7.14.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
+    "@babel/plugin-transform-unicode-regex" "^7.14.5"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.15.6"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.5"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    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==
@@ -1219,7 +2005,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.3", "@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==
@@ -1230,7 +2016,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.0.0", "@babel/preset-react@^7.12.1":
+"@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==
@@ -1243,14 +2029,26 @@
     "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
-"@babel/preset-typescript@^7.12.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz#fc7df8199d6aae747896f1e6c61fc872056632a3"
-  integrity sha512-nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==
+"@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==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.1"
-    "@babel/plugin-transform-typescript" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-react-display-name" "^7.14.5"
+    "@babel/plugin-transform-react-jsx" "^7.14.5"
+    "@babel/plugin-transform-react-jsx-development" "^7.14.5"
+    "@babel/plugin-transform-react-pure-annotations" "^7.14.5"
+
+"@babel/preset-typescript@^7.12.7":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz#e8fca638a1a0f64f14e1119f7fe4500277840945"
+  integrity sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-transform-typescript" "^7.15.0"
 
 "@babel/register@^7.12.1", "@babel/register@^7.5.5":
   version "7.12.1"
@@ -1271,14 +2069,7 @@
     core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83"
-  integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@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":
+"@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==
@@ -1292,6 +2083,13 @@
   dependencies:
     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==
+  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"
@@ -1310,6 +2108,15 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/template@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@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"
@@ -1354,6 +2161,21 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
+"@babel/traverse@^7.12.11", "@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==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
+    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"
@@ -1380,6 +2202,19 @@
     "@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":
+  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==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.9"
+    to-fast-properties "^2.0.0"
+
+"@base2/pretty-print-object@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
+  integrity sha512-4Th98KlMHr5+JkxfcoDT//6vY8vM+iSPrLNpHhRyLx2CFYi8e2RfqPLdpbnpo0Q5lQC5hNB79yes07zb02fvCw==
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1400,6 +2235,11 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@discoveryjs/json-ext@^0.5.3":
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3"
+  integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==
+
 "@download/blockies@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@download/blockies/-/blockies-1.0.3.tgz#9aea770f9de72f3f947f1b3a53ee1e92f8dc4a68"
@@ -1508,7 +2348,7 @@
     "@emotion/serialize" "^0.11.15"
     "@emotion/utils" "0.11.3"
 
-"@emotion/styled@^10.0.23", "@emotion/styled@^10.0.27":
+"@emotion/styled@^10.0.27":
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.27.tgz#12cb67e91f7ad7431e1875b1d83a94b814133eaf"
   integrity sha512-iK/8Sh7+NLJzyp9a5+vIQIXTYxfT4yB/OJbjzQanB2RZpvmzBQOHZWhpAMZWYEKRNNbsD6WfBw5sVWkb6WzS/Q==
@@ -1591,7 +2431,7 @@
     crc-32 "^1.2.0"
     ethereumjs-util "^7.1.0"
 
-"@ethereumjs/tx@^3.1.4", "@ethereumjs/tx@^3.2.0", "@ethereumjs/tx@^3.2.1", "@ethereumjs/tx@^3.3.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":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378"
   integrity sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==
@@ -1644,6 +2484,21 @@
     "@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"
+  integrity sha512-loW7I4AohP5KycATvc0MgujU6JyCHPqHdeoo9z3Nr9xEiNioxa65ccdm1+fsoJhkuhdRtfcL8cfyGamz2AxZ5w==
+  dependencies:
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
 "@ethersproject/abstract-provider@5.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"
@@ -1670,6 +2525,19 @@
     "@ethersproject/transactions" "^5.4.0"
     "@ethersproject/web" "^5.4.0"
 
+"@ethersproject/abstract-provider@5.5.1", "@ethersproject/abstract-provider@^5.5.0":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.5.1.tgz#2f1f6e8a3ab7d378d8ad0b5718460f85649710c5"
+  integrity sha512-m+MA/ful6eKbxpr99xUYeRvLkfnlqzrF8SZ46d/xFB1A7ZVknYc/sXJG0RcufF52Qn2jeFj1hhcoQ7IXjNKUqg==
+  dependencies:
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/networks" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/web" "^5.5.0"
+
 "@ethersproject/abstract-provider@^5.0.4":
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.5.tgz#797a32a8707830af1ad8f833e9c228994d5572b9"
@@ -1705,6 +2573,17 @@
     "@ethersproject/logger" "^5.4.0"
     "@ethersproject/properties" "^5.4.0"
 
+"@ethersproject/abstract-signer@5.5.0", "@ethersproject/abstract-signer@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz#590ff6693370c60ae376bf1c7ada59eb2a8dd08d"
+  integrity sha512-lj//7r250MXVLKI7sVarXAbZXbv9P50lgmJQGr2/is82EwEb8r7HrxsmMqAjTsztMYy7ohrIhGMIml+Gx4D3mA==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@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"
@@ -1727,6 +2606,17 @@
     "@ethersproject/logger" "^5.4.0"
     "@ethersproject/rlp" "^5.4.0"
 
+"@ethersproject/address@5.5.0", "@ethersproject/address@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.5.0.tgz#bcc6f576a553f21f3dd7ba17248f81b473c9c78f"
+  integrity sha512-l4Nj0eWlTUh6ro5IbPTgbpT4wRbdH5l8CQf7icF7sb/SI3Nhd9Y9HzhonTSTi6CefI0necIw7LJqQPopPLZyWw==
+  dependencies:
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/rlp" "^5.5.0"
+
 "@ethersproject/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"
@@ -1746,6 +2636,13 @@
   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"
+  integrity sha512-tdayUKhU1ljrlHzEWbStXazDpsx4eg1dBXUSI6+mHlYklOXoXF6lZvw8tnD6oVaWfnMxAgRSKROg3cVKtCcppA==
+  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"
@@ -1761,6 +2658,14 @@
     "@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"
+  integrity sha512-ZIodwhHpVJ0Y3hUCfUucmxKsWQA5TMnavp5j/UOuDdzZWzJlRmuOjcTMIGgHCYuZmHt36BfiSyQPSRskPxbfaQ==
+  dependencies:
+    "@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"
@@ -1779,6 +2684,15 @@
     "@ethersproject/logger" "^5.4.0"
     bn.js "^4.11.9"
 
+"@ethersproject/bignumber@5.5.0", "@ethersproject/bignumber@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.5.0.tgz#875b143f04a216f4f8b96245bde942d42d279527"
+  integrity sha512-6Xytlwvy6Rn3U3gKEc1vP7nR92frHkv6wtVr95LFR3jREXiCPzdWxKQ1cx4JGQBXxcguAwjA8murlYN2TSiEbg==
+  dependencies:
+    "@ethersproject/bytes" "^5.5.0"
+    "@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"
@@ -1795,6 +2709,13 @@
   dependencies:
     "@ethersproject/logger" "^5.4.0"
 
+"@ethersproject/bytes@5.5.0", "@ethersproject/bytes@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c"
+  integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog==
+  dependencies:
+    "@ethersproject/logger" "^5.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"
@@ -1816,6 +2737,13 @@
   dependencies:
     "@ethersproject/bignumber" "^5.4.0"
 
+"@ethersproject/constants@5.5.0", "@ethersproject/constants@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.5.0.tgz#d2a2cd7d94bd1d58377d1d66c4f53c9be4d0a45e"
+  integrity sha512-2MsRRVChkvMWR+GyMGY4N1sAX9Mt3J9KykCsgUFd/1mwS0UH1qw+Bv9k1UJb3X3YJYFco9H20pjSlOIfCG5HYQ==
+  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"
@@ -1855,6 +2783,22 @@
     "@ethersproject/properties" "^5.4.0"
     "@ethersproject/transactions" "^5.4.0"
 
+"@ethersproject/contracts@5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.5.0.tgz#b735260d4bd61283a670a82d5275e2a38892c197"
+  integrity sha512-2viY7NzyvJkh+Ug17v7g3/IJC8HqZBDcOjYARZLdzRxrfGlRgmYgl6xPRKVbEzy1dWKw/iv7chDcS83pg6cLxg==
+  dependencies:
+    "@ethersproject/abi" "^5.5.0"
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+
 "@ethersproject/hardware-wallets@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/hardware-wallets/-/hardware-wallets-5.4.0.tgz#bce275b395e26b6f50481095331157614490a473"
@@ -1881,6 +2825,20 @@
     "@ethersproject/properties" "^5.4.0"
     "@ethersproject/strings" "^5.4.0"
 
+"@ethersproject/hash@5.5.0", "@ethersproject/hash@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.5.0.tgz#7cee76d08f88d1873574c849e0207dcb32380cc9"
+  integrity sha512-dnGVpK1WtBjmnp3mUT0PlU2MpapnwWI0PibldQEq1408tQBAbZpPidkWoVVuNMOl/lISO3+4hXZWCL3YV7qzfg==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
 "@ethersproject/hash@>=5.0.0-beta.128":
   version "5.0.6"
   resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.6.tgz#2a2e8a1470685421217e9e86e9971ca636e609ce"
@@ -1913,6 +2871,24 @@
     "@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"
+  integrity sha512-mcSOo9zeUg1L0CoJH7zmxwUG5ggQHU1UrRf8jyTYy6HxdZV+r0PBoL1bxr+JHIPXRzS6u/UW4mEn43y0tmyF8Q==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/basex" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/pbkdf2" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/sha2" "^5.5.0"
+    "@ethersproject/signing-key" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/wordlists" "^5.5.0"
+
 "@ethersproject/json-wallets@5.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"
@@ -1932,6 +2908,25 @@
     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"
+  integrity sha512-9lA21XQnCdcS72xlBn1jfQdj2A1VUxZzOzi9UkNdnokNKke/9Ya2xA9aIK1SC3PQyBDLt4C+dfps7ULpkvKikQ==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/hdnode" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/pbkdf2" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/random" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    aes-js "3.0.0"
+    scrypt-js "3.0.1"
+
 "@ethersproject/keccak256@5.4.0", "@ethersproject/keccak256@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.4.0.tgz#7143b8eea4976080241d2bd92e3b1f1bf7025318"
@@ -1940,6 +2935,14 @@
     "@ethersproject/bytes" "^5.4.0"
     js-sha3 "0.5.7"
 
+"@ethersproject/keccak256@5.5.0", "@ethersproject/keccak256@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.5.0.tgz#e4b1f9d7701da87c564ffe336f86dcee82983492"
+  integrity sha512-5VoFCTjo2rYbBe1l2f4mccaRFN/4VQEYFwwn04aJV2h7qf4ZvI2wFxUE1XOX+snbwCLRzIeikOqtAoPwMza9kg==
+  dependencies:
+    "@ethersproject/bytes" "^5.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"
@@ -1958,6 +2961,11 @@
   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":
+  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"
@@ -1982,6 +2990,13 @@
   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"
+  integrity sha512-KWfP3xOnJeF89Uf/FCJdV1a2aDJe5XTN2N52p4fcQ34QhDqQFkgQKZ39VGtiqUgHcLI8DfT0l9azC3KFTunqtA==
+  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"
@@ -1997,6 +3012,14 @@
     "@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"
+  integrity sha512-SaDvQFvXPnz1QGpzr6/HToLifftSXGoXrbpZ6BvoZhmx4bNLHrxDe8MZisuecyOziP1aVEwzC2Hasj+86TgWVg==
+  dependencies:
+    "@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"
@@ -2011,6 +3034,13 @@
   dependencies:
     "@ethersproject/logger" "^5.4.0"
 
+"@ethersproject/properties@5.5.0", "@ethersproject/properties@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.5.0.tgz#61f00f2bb83376d2071baab02245f92070c59995"
+  integrity sha512-l3zRQg3JkD8EL3CPjNK5g7kMx4qSwiR60/uk5IVjd3oq1MZR5qUg40CNOoEJoX5wc3DyY5bt9EbMk86C7x0DNA==
+  dependencies:
+    "@ethersproject/logger" "^5.5.0"
+
 "@ethersproject/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"
@@ -2075,6 +3105,31 @@
     bech32 "1.1.4"
     ws "7.4.6"
 
+"@ethersproject/providers@5.5.0":
+  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==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/basex" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/networks" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/random" "^5.5.0"
+    "@ethersproject/rlp" "^5.5.0"
+    "@ethersproject/sha2" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/web" "^5.5.0"
+    bech32 "1.1.4"
+    ws "7.4.6"
+
 "@ethersproject/random@5.4.0", "@ethersproject/random@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.4.0.tgz#9cdde60e160d024be39cc16f8de3b9ce39191e16"
@@ -2083,6 +3138,14 @@
     "@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"
+  integrity sha512-egGYZwZ/YIFKMHcoBUo8t3a8Hb/TKYX8BCBoLjudVCZh892welR3jOxgOmb48xznc9bTcMm7Tpwc1gHC1PFNFQ==
+  dependencies:
+    "@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"
@@ -2091,6 +3154,14 @@
     "@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"
+  integrity sha512-hLv8XaQ8PTI9g2RHoQGf/WSxBfTB/NudRacbzdxmst5VHAqd1sMibWG7SENzT5Dj3yZ3kJYx+WiRYEcQTAkcYA==
+  dependencies:
+    "@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"
@@ -2108,6 +3179,15 @@
     "@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"
+  integrity sha512-B5UBoglbCiHamRVPLA110J+2uqsifpZaTmid2/7W5rbtYVz6gus6/hSDieIU/6gaKIDcOj12WnOdiymEUHIAOA==
+  dependencies:
+    "@ethersproject/bytes" "^5.5.0"
+    "@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"
@@ -2120,6 +3200,18 @@
     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"
+  integrity sha512-5VmseH7qjtNmDdZBswavhotYbWB0bOwKIlOTSlX14rKn5c11QmJwGt4GHeo7NrL/Ycl7uo9AHvEqs5xZgFBTng==
+  dependencies:
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    bn.js "^4.11.9"
+    elliptic "6.5.4"
+    hash.js "1.1.7"
+
 "@ethersproject/signing-key@^5.0.4":
   version "5.0.11"
   resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.11.tgz#19fc5c4597e18ad0a5efc6417ba5b74069fdd2af"
@@ -2141,6 +3233,18 @@
     "@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"
+  integrity sha512-9NgZs9LhGMj6aCtHXhtmFQ4AN4sth5HuFXVvAQtzmm0jpSCNOTGtrHZJAeYTh7MBjRR8brylWZxBZR9zDStXbw==
+  dependencies:
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/sha2" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
 "@ethersproject/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"
@@ -2150,6 +3254,15 @@
     "@ethersproject/constants" "^5.4.0"
     "@ethersproject/logger" "^5.4.0"
 
+"@ethersproject/strings@5.5.0", "@ethersproject/strings@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.5.0.tgz#e6784d00ec6c57710755699003bc747e98c5d549"
+  integrity sha512-9fy3TtF5LrX/wTrBaT8FGE6TDJyVjOvXynXJz5MT5azq+E6D92zuKNx7i29sWW2FjVOaWjAsiZ1ZWznuduTIIQ==
+  dependencies:
+    "@ethersproject/bytes" "^5.5.0"
+    "@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"
@@ -2174,6 +3287,21 @@
     "@ethersproject/rlp" "^5.4.0"
     "@ethersproject/signing-key" "^5.4.0"
 
+"@ethersproject/transactions@5.5.0", "@ethersproject/transactions@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.5.0.tgz#7e9bf72e97bcdf69db34fe0d59e2f4203c7a2908"
+  integrity sha512-9RZYSKX26KfzEd/1eqvv8pLauCKzDTub0Ko4LfIgaERvRuwyaNV78mJs7cpIgZaDl6RJui4o49lHwwCM0526zA==
+  dependencies:
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/rlp" "^5.5.0"
+    "@ethersproject/signing-key" "^5.5.0"
+
 "@ethersproject/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"
@@ -2198,6 +3326,15 @@
     "@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"
+  integrity sha512-7+DpjiZk4v6wrikj+TCyWWa9dXLNU73tSTa7n0TSJDxkYbV3Yf1eRh9ToMLlZtuctNYu9RDNNy2USq3AdqSbag==
+  dependencies:
+    "@ethersproject/bignumber" "^5.5.0"
+    "@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"
@@ -2219,6 +3356,27 @@
     "@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"
+  integrity sha512-Mlu13hIctSYaZmUOo7r2PhNSd8eaMPVXe1wxrz4w4FCE4tDYBywDH+bAR1Xz2ADyXGwqYMwstzTrtUVIsKDO0Q==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/hdnode" "^5.5.0"
+    "@ethersproject/json-wallets" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/random" "^5.5.0"
+    "@ethersproject/signing-key" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/wordlists" "^5.5.0"
+
 "@ethersproject/web@5.4.0", "@ethersproject/web@^5.4.0":
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.4.0.tgz#49fac173b96992334ed36a175538ba07a7413d1f"
@@ -2230,6 +3388,17 @@
     "@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"
+  integrity sha512-BEgY0eL5oH4mAo37TNYVrFeHsIXLRxggCRG/ksRIxI2X5uj5IsjGmcNiRN/VirQOlBxcUhCgHhaDLG4m6XAVoA==
+  dependencies:
+    "@ethersproject/base64" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
 "@ethersproject/web@^5.0.6":
   version "5.0.9"
   resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.9.tgz#b08f8295f4bfd4777c8723fe9572f5453b9f03cb"
@@ -2252,6 +3421,17 @@
     "@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"
+  integrity sha512-bL0UTReWDiaQJJYOC9sh/XcRu/9i2jMrzf8VLRmPKx58ckSlOJiohODkECCO50dtLZHcGU6MLXQ4OOrgBwP77Q==
+  dependencies:
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
 "@formatjs/intl-relativetimeformat@^5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-5.2.6.tgz#3d67b75a900e7b5416615beeb2d0eeff33a1e01a"
@@ -2567,11 +3747,6 @@
     "@hapi/bourne" "1.x.x"
     "@hapi/hoek" "6.x.x"
 
-"@icons/material@^0.2.4":
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/@icons/material/-/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8"
-  integrity sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==
-
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
@@ -2954,6 +4129,50 @@
     prop-types "^15.7.2"
     react-is "^16.8.0"
 
+"@mdx-js/loader@^1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4"
+  integrity sha512-9CjGwy595NaxAYp0hF9B/A0lH6C8Rms97e2JS9d3jVUtILn6pT5i5IV965ra3lIWc7Rs1GG1tBdVF7dCowYe6Q==
+  dependencies:
+    "@mdx-js/mdx" "1.6.22"
+    "@mdx-js/react" "1.6.22"
+    loader-utils "2.0.0"
+
+"@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
+  integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==
+  dependencies:
+    "@babel/core" "7.12.9"
+    "@babel/plugin-syntax-jsx" "7.12.1"
+    "@babel/plugin-syntax-object-rest-spread" "7.8.3"
+    "@mdx-js/util" "1.6.22"
+    babel-plugin-apply-mdx-type-prop "1.6.22"
+    babel-plugin-extract-import-names "1.6.22"
+    camelcase-css "2.0.1"
+    detab "2.0.4"
+    hast-util-raw "6.0.1"
+    lodash.uniq "4.5.0"
+    mdast-util-to-hast "10.0.1"
+    remark-footnotes "2.0.0"
+    remark-mdx "1.6.22"
+    remark-parse "8.0.3"
+    remark-squeeze-paragraphs "4.0.0"
+    style-to-object "0.3.0"
+    unified "9.2.0"
+    unist-builder "2.0.3"
+    unist-util-visit "2.0.3"
+
+"@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573"
+  integrity sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==
+
+"@mdx-js/util@1.6.22":
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/@mdx-js/util/-/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b"
+  integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==
+
 "@metamask/auto-changelog@^2.1.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@metamask/auto-changelog/-/auto-changelog-2.5.0.tgz#078f38142a3086fdb5556c758969a015c71dfdc9"
@@ -3095,10 +4314,10 @@
     color "^0.11.3"
     mersenne-twister "^1.1.0"
 
-"@metamask/logo@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@metamask/logo/-/logo-3.0.1.tgz#9c0758d9abc56345c5e4ed01cac22a6d2d452793"
-  integrity sha512-EV1BqyUI/GX1X9pTIydBRZ94c7Zx4Vlsl6V/zIOqk8Zw9mhlLG46lRQSBCq8syCvuGeKVMj/1LYsf/sNVf/SsA==
+"@metamask/logo@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/logo/-/logo-3.1.0.tgz#6b7b9b90b6d846583558de855511d34796735855"
+  integrity sha512-W0FBwIaG1pC4Vk/ZdUJYv7PDjnAbQJro3yhEXN7WXEdz8kyVcxFb6dj0Dpe6ytaveYiqIL6+iDDWMevzU2MpVw==
   dependencies:
     gl-mat4 "1.1.4"
     gl-vec3 "1.0.3"
@@ -3226,7 +4445,7 @@
     puka "^1.0.1"
     read-package-json-fast "^1.1.3"
 
-"@pmmmwh/react-refresh-webpack-plugin@^0.4.2":
+"@pmmmwh/react-refresh-webpack-plugin@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz#1eec460596d200c0236bf195b078a5d1df89b766"
   integrity sha512-br5Qwvh8D2OQqSXpd1g/xqXKnK0r+Jz6qVKBbWmpUcrbGOxUrf39V5oZ1876084CGn18uMdR5uvPqBv9UqtBjQ==
@@ -3253,7 +4472,7 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@reach/router@^1.3.3", "@reach/router@^1.3.4":
+"@reach/router@^1.3.4":
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
   integrity sha512-+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA==
@@ -3281,14 +4500,14 @@
     component-type "^1.2.1"
     join-component "^1.1.0"
 
-"@sentry/browser@^5.26.0":
-  version "5.26.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.26.0.tgz#e90a197fb94c5f26c8e05d6a539c118f33c7d598"
-  integrity sha512-52kNVpy10Zd3gJRGFkhnOQvr80WJg7+XBqjMOE0//Akh4PfvEK3IqmAjVqysz6aHdruwTTivKF4ZoAxL/pA7Rg==
+"@sentry/browser@^6.0.0":
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.13.3.tgz#d4511791b1e484ad48785eba3bce291fdf115c1e"
+  integrity sha512-jwlpsk2/u1cofvfYsjmqcnx50JJtf/T6HTgdW+ih8+rqWC5ABEZf4IiB/H+KAyjJ3wVzCOugMq5irL83XDCfqQ==
   dependencies:
-    "@sentry/core" "5.26.0"
-    "@sentry/types" "5.26.0"
-    "@sentry/utils" "5.26.0"
+    "@sentry/core" "6.13.3"
+    "@sentry/types" "6.13.3"
+    "@sentry/utils" "6.13.3"
     tslib "^1.9.3"
 
 "@sentry/cli@^1.58.0":
@@ -3302,56 +4521,56 @@
     progress "^2.0.3"
     proxy-from-env "^1.1.0"
 
-"@sentry/core@5.26.0":
-  version "5.26.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.26.0.tgz#9b5fe4de8a869d733ebcc77f5ec9c619f8717a51"
-  integrity sha512-Ubrw7K52orTVsaxpz8Su40FPXugKipoQC+zPrXcH+JIMB+o18kutF81Ae4WzuUqLfP7YB91eAlRrP608zw0EXA==
+"@sentry/core@6.13.3":
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.13.3.tgz#5cbbb995128e793ebebcbf1d3b7514e0e5e8b221"
+  integrity sha512-obm3SjgCk8A7nB37b2AU1eq1q7gMoJRrGMv9VRIyfcG0Wlz/5lJ9O3ohUk+YZaaVfZMxXn6hFtsBiOWmlv7IIA==
   dependencies:
-    "@sentry/hub" "5.26.0"
-    "@sentry/minimal" "5.26.0"
-    "@sentry/types" "5.26.0"
-    "@sentry/utils" "5.26.0"
+    "@sentry/hub" "6.13.3"
+    "@sentry/minimal" "6.13.3"
+    "@sentry/types" "6.13.3"
+    "@sentry/utils" "6.13.3"
     tslib "^1.9.3"
 
-"@sentry/hub@5.26.0":
-  version "5.26.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.26.0.tgz#b2bbd8128cd5915f2ee59cbc29fff30272d74ec5"
-  integrity sha512-lAYeWvvhGYS6eQ5d0VEojw0juxGc3v4aAu8VLvMKWcZ1jXD13Bhc46u9Nvf4qAY6BAQsJDQcpEZLpzJu1bk1Qw==
+"@sentry/hub@6.13.3":
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.13.3.tgz#cc09623a69b5343315fdb61c7fdd0be74b72299f"
+  integrity sha512-eYppBVqvhs5cvm33snW2sxfcw6G20/74RbBn+E4WDo15hozis89kU7ZCJDOPkXuag3v1h9igns/kM6PNBb41dw==
   dependencies:
-    "@sentry/types" "5.26.0"
-    "@sentry/utils" "5.26.0"
+    "@sentry/types" "6.13.3"
+    "@sentry/utils" "6.13.3"
     tslib "^1.9.3"
 
-"@sentry/integrations@^5.26.0":
-  version "5.26.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.26.0.tgz#cf90005359862c5b1df4df0f1ce8be5e56c9e1ad"
-  integrity sha512-XBMPm3wWW+3EJvWFHdVcl0PSWjjNEzmQxjjWeMv9vLWAC1zhS8gcpk/LyDIFWojJBzhASD8f1mLv2ZdKZtA1ZQ==
+"@sentry/integrations@^6.0.0":
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.13.3.tgz#9d80229de6e815c53fa52ca2422a0d13820b8d4e"
+  integrity sha512-iC8LkbBTxlRo9FNxRqFfEm85FrELltc3E9gFsFSBkCnf7S/3nDCDW+mJX92KpRk97Wqid6/JwlXttKz8lsdF2A==
   dependencies:
-    "@sentry/types" "5.26.0"
-    "@sentry/utils" "5.26.0"
-    localforage "1.8.1"
+    "@sentry/types" "6.13.3"
+    "@sentry/utils" "6.13.3"
+    localforage "^1.8.1"
     tslib "^1.9.3"
 
-"@sentry/minimal@5.26.0":
-  version "5.26.0"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.26.0.tgz#851dea3644153ed3ac4837fa8ed5661d94e7a313"
-  integrity sha512-mdFo3FYaI1W3KEd8EHATYx8mDOZIxeoUhcBLlH7Iej6rKvdM7p8GoECrmHPU1l6sCCPtBuz66QT5YeXc7WILsA==
+"@sentry/minimal@6.13.3":
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.13.3.tgz#a675a79bcc830142e4f95e6198a2efde2cd3901e"
+  integrity sha512-63MlYYRni3fs5Bh8XBAfVZ+ctDdWg0fapSTP1ydIC37fKvbE+5zhyUqwrEKBIiclEApg1VKX7bkKxVdu/vsFdw==
   dependencies:
-    "@sentry/hub" "5.26.0"
-    "@sentry/types" "5.26.0"
+    "@sentry/hub" "6.13.3"
+    "@sentry/types" "6.13.3"
     tslib "^1.9.3"
 
-"@sentry/types@5.26.0":
-  version "5.26.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.26.0.tgz#b0cbacb0b24cd86620fb296b46cf7277bb004a3e"
-  integrity sha512-ugpa1ePOhK55pjsyutAsa2tiJVQEyGYCaOXzaheg/3+EvhMdoW+owiZ8wupfvPhtZFIU3+FPOVz0d5k9K5d1rw==
+"@sentry/types@6.13.3":
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.13.3.tgz#63ad5b6735b0dfd90b3a256a9f8e77b93f0f66b2"
+  integrity sha512-Vrz5CdhaTRSvCQjSyIFIaV9PodjAVFkzJkTRxyY7P77RcegMsRSsG1yzlvCtA99zG9+e6MfoJOgbOCwuZids5A==
 
-"@sentry/utils@5.26.0":
-  version "5.26.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.26.0.tgz#09a3d01d91747f38f796cafeb24f8fd86e4fa05f"
-  integrity sha512-F2gnHIAWbjiowcAgxz3VpKxY/NQ39NTujEd/NPnRTWlRynLFg3bAV+UvZFXljhYJeN3b/zRlScNDcpCWTrtZGw==
+"@sentry/utils@6.13.3":
+  version "6.13.3"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.13.3.tgz#188754d40afe693c3fcae410f9322531588a9926"
+  integrity sha512-zYFuFH3MaYtBZTeJ4Yajg7pDf0pM3MWs3+9k5my9Fd+eqNcl7dYQYJbT9gyC0HXK1QI4CAMNNlHNl4YXhF91ag==
   dependencies:
-    "@sentry/types" "5.26.0"
+    "@sentry/types" "6.13.3"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":
@@ -3413,151 +4632,233 @@
   resolved "https://registry.yarnpkg.com/@stablelib/utf8/-/utf8-0.10.1.tgz#eecf54884da7b2bee235e3c70efb8cd5c07ba5bd"
   integrity sha512-+uM1YZ4MhBC82vt99prF7DXNGqhYmJ9cQ3p5qNowMNkkzn9OWEkqBvguBW3ChAt7JvqZ3SD5HJOfc6YgnfMTHw==
 
-"@storybook/addon-actions@^6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.1.17.tgz#9d32336284738cefa69b99acafa4b132d5533600"
-  integrity sha512-4hyAvmjnI4C1ZQ7/t21jKKXE0jO1zAk310BkYin0NJf77Qi0tUE1DNOwirJY/xzRih36wWi1V79c/ZOJNsLv9Q==
-  dependencies:
-    "@storybook/addons" "6.1.17"
-    "@storybook/api" "6.1.17"
-    "@storybook/client-api" "6.1.17"
-    "@storybook/components" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    "@storybook/theming" "6.1.17"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    polished "^3.4.4"
+"@storybook/addon-a11y@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-6.3.12.tgz#2f930fc84fc275a4ed43a716fc09cc12caf4e110"
+  integrity sha512-q1NdRHFJV6sLEEJw0hatCc5ZIthELqM/AWdrEWDyhcJNyiq7Tq4nKqQBMTQSYwHiUAmxVgw7i4oa1vM2M51/3g==
+  dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/channels" "6.3.12"
+    "@storybook/client-api" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    axe-core "^4.2.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    react-sizeme "^3.0.1"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
+"@storybook/addon-actions@6.3.12", "@storybook/addon-actions@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.3.12.tgz#69eb5f8f780f1b00456051da6290d4b959ba24a0"
+  integrity sha512-mzuN4Ano4eyicwycM2PueGzzUCAEzt9/6vyptWEIVJu0sjK0J9KtBRlqFi1xGQxmCfimDR/n/vWBBkc7fp2uJA==
+  dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/client-api" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    core-js "^3.8.2"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    polished "^4.0.5"
+    prop-types "^15.7.2"
+    react-inspector "^5.1.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+    uuid-browser "^3.1.0"
+
+"@storybook/addon-backgrounds@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.3.12.tgz#5feecd461f48178aa976ba2694418e9ea1d621b3"
+  integrity sha512-51cHBx0HV7K/oRofJ/1pE05qti6sciIo8m4iPred1OezXIrJ/ckzP+gApdaUdzgcLAr6/MXQWLk0sJuImClQ6w==
+  dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    memoizerific "^1.11.3"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+
+"@storybook/addon-controls@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.3.12.tgz#dbb732c62cf06fb7ccaf87d6ab11c876d14456fc"
+  integrity sha512-WO/PbygE4sDg3BbstJ49q0uM3Xu5Nw4lnHR5N4hXSvRAulZt1d1nhphRTHjfX+CW+uBcfzkq9bksm6nKuwmOyw==
+  dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/client-api" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/node-logger" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    core-js "^3.8.2"
+    ts-dedent "^2.0.0"
+
+"@storybook/addon-docs@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.3.12.tgz#2ec73b4f231d9f190d5c89295bc47bea6a95c6d1"
+  integrity sha512-iUrqJBMTOn2PgN8AWNQkfxfIPkh8pEg27t8UndMgfOpeGK/VWGw2UEifnA82flvntcilT4McxmVbRHkeBY9K5A==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/generator" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/plugin-transform-react-jsx" "^7.12.12"
+    "@babel/preset-env" "^7.12.11"
+    "@jest/transform" "^26.6.2"
+    "@mdx-js/loader" "^1.6.22"
+    "@mdx-js/mdx" "^1.6.22"
+    "@mdx-js/react" "^1.6.22"
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/builder-webpack4" "6.3.12"
+    "@storybook/client-api" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/core" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/csf" "0.0.1"
+    "@storybook/csf-tools" "6.3.12"
+    "@storybook/node-logger" "6.3.12"
+    "@storybook/postinstall" "6.3.12"
+    "@storybook/source-loader" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    acorn "^7.4.1"
+    acorn-jsx "^5.3.1"
+    acorn-walk "^7.2.0"
+    core-js "^3.8.2"
+    doctrine "^3.0.0"
+    escodegen "^2.0.0"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    html-tags "^3.1.0"
+    js-string-escape "^1.0.1"
+    loader-utils "^2.0.0"
+    lodash "^4.17.20"
+    p-limit "^3.1.0"
+    prettier "~2.2.1"
     prop-types "^15.7.2"
-    react-inspector "^5.0.1"
+    react-element-to-jsx-string "^14.3.2"
     regenerator-runtime "^0.13.7"
+    remark-external-links "^8.0.0"
+    remark-slug "^6.0.0"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
-    uuid "^8.0.0"
-
-"@storybook/addon-backgrounds@^6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.1.17.tgz#df4eeec1df72d5f835e82bee433493110463f896"
-  integrity sha512-1a8Vu50eQWdwMek9w2QOehhu10aZYzyR404qwGvPCRGt5uMMsKxoKvv1M6/ETW7d2G4Srl/Ka+k4x6ykoHIepA==
-  dependencies:
-    "@storybook/addons" "6.1.17"
-    "@storybook/api" "6.1.17"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/components" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    "@storybook/theming" "6.1.17"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
+
+"@storybook/addon-essentials@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.3.12.tgz#445cc4bc2eb9168a9e5de1fdfb5ef3b92974e74b"
+  integrity sha512-PK0pPE0xkq00kcbBcFwu/5JGHQTu4GvLIHfwwlEGx6GWNQ05l6Q+1Z4nE7xJGv2PSseSx3CKcjn8qykNLe6O6g==
+  dependencies:
+    "@storybook/addon-actions" "6.3.12"
+    "@storybook/addon-backgrounds" "6.3.12"
+    "@storybook/addon-controls" "6.3.12"
+    "@storybook/addon-docs" "6.3.12"
+    "@storybook/addon-measure" "^2.0.0"
+    "@storybook/addon-toolbars" "6.3.12"
+    "@storybook/addon-viewport" "6.3.12"
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/node-logger" "6.3.12"
+    core-js "^3.8.2"
     regenerator-runtime "^0.13.7"
+    storybook-addon-outline "^1.4.1"
     ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
 
-"@storybook/addon-knobs@^6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-6.1.17.tgz#c7cdd5be813c2b80ce7f464eabf8ceb06486e82d"
-  integrity sha512-WUkoGtHhXIurXFQybsMXZaphAtCNclZjZHvji8O5eg+ahx7pIM/Wldh3uJwOdOkW5LHxT76hLxPvuXvOEysnbw==
-  dependencies:
-    "@storybook/addons" "6.1.17"
-    "@storybook/api" "6.1.17"
-    "@storybook/channels" "6.1.17"
-    "@storybook/client-api" "6.1.17"
-    "@storybook/components" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    "@storybook/theming" "6.1.17"
-    copy-to-clipboard "^3.0.8"
-    core-js "^3.0.1"
+"@storybook/addon-knobs@^6.3.1":
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-6.3.1.tgz#2115c6f0d5759e4fe73d5f25710f4a94ebd6f0db"
+  integrity sha512-2GGGnQSPXXUhHHYv4IW6pkyQlCPYXKYiyGzfhV7Zhs95M2Ban08OA6KLmliMptWCt7U9tqTO8dB5u0C2cWmCTw==
+  dependencies:
+    copy-to-clipboard "^3.3.1"
+    core-js "^3.8.2"
     escape-html "^1.0.3"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
+    fast-deep-equal "^3.1.3"
+    global "^4.4.0"
+    lodash "^4.17.20"
     prop-types "^15.7.2"
-    qs "^6.6.0"
-    react-color "^2.17.0"
+    qs "^6.10.0"
+    react-colorful "^5.1.2"
     react-lifecycles-compat "^3.0.4"
-    react-select "^3.0.8"
-    regenerator-runtime "^0.13.7"
+    react-select "^3.2.0"
 
-"@storybook/addon-toolbars@^6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.1.17.tgz#15a015dc871e26be66340b5641631e649925c5e2"
-  integrity sha512-hEH4MFNbhCOzHs9yB+V+GH9FHD5MN7dxUfLFYM1tuZPqtotgfrYwCBUTy8m/tSxyOOSM+Y1BSHBozt2h7D23eA==
-  dependencies:
-    "@storybook/addons" "6.1.17"
-    "@storybook/api" "6.1.17"
-    "@storybook/client-api" "6.1.17"
-    "@storybook/components" "6.1.17"
-    core-js "^3.0.1"
-
-"@storybook/addons@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.1.17.tgz#ab0666446acb9fc19c94d7204dc9aafdefb6c7c2"
-  integrity sha512-3upDPJPzUkls2V3Fozzg+JOcv138bF90pbdRe9YSNu37QvRIL+iQODY7oFygMl+kqjG2F1FGw5EvxAV1mnlwCw==
-  dependencies:
-    "@storybook/api" "6.1.17"
-    "@storybook/channels" "6.1.17"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    "@storybook/router" "6.1.17"
-    "@storybook/theming" "6.1.17"
-    core-js "^3.0.1"
-    global "^4.3.2"
+"@storybook/addon-measure@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-2.0.0.tgz#c40bbe91bacd3f795963dc1ee6ff86be87deeda9"
+  integrity sha512-ZhdT++cX+L9LwjhGYggvYUUVQH/MGn2rwbrAwCMzA/f2QTFvkjxzX8nDgMxIhaLCDC+gHIxfJG2wrWN0jkBr3g==
+
+"@storybook/addon-toolbars@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.3.12.tgz#bc0d420b3476c891c42f7b0ab3b457e9e5ef7ca5"
+  integrity sha512-8GvP6zmAfLPRnYRARSaIwLkQClLIRbflRh4HZoFk6IMjQLXZb4NL3JS5OLFKG+HRMMU2UQzfoSDqjI7k7ptyRw==
+  dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/client-api" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    core-js "^3.8.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/addons@^6.1.7":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.3.4.tgz#016c5c3e36c78a320eb8b022cf7fe556d81577c2"
-  integrity sha512-rf8K8X3JrB43gq5nw5SYgfucQkFg2QgUMWdByf7dQ4MyIl5zet+2MYiSXJ9lfbhGKJZ8orc81rmMtiocW4oBjg==
-  dependencies:
-    "@storybook/api" "6.3.4"
-    "@storybook/channels" "6.3.4"
-    "@storybook/client-logger" "6.3.4"
-    "@storybook/core-events" "6.3.4"
-    "@storybook/router" "6.3.4"
-    "@storybook/theming" "6.3.4"
+"@storybook/addon-viewport@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.3.12.tgz#2fd61e60644fb07185a662f75b3e9dad8ad14f01"
+  integrity sha512-TRjyfm85xouOPmXxeLdEIzXLfJZZ1ePQ7p/5yphDGBHdxMU4m4qiZr8wYpUaxHsRu/UB3dKfaOyGT+ivogbnbw==
+  dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/theming" "6.3.12"
     core-js "^3.8.2"
     global "^4.4.0"
+    memoizerific "^1.11.3"
+    prop-types "^15.7.2"
     regenerator-runtime "^0.13.7"
 
-"@storybook/api@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.1.17.tgz#50393ce9b718063b67680212df895eceacc0c11d"
-  integrity sha512-sthcfuk2EQ3F5R620PBqpI4Pno3g7KQm6YPZA0DXB+LD/z61xH9ToE1gTLF4nzlE6HwghwkXOZyRwDowRdG+7A==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@storybook/channels" "6.1.17"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.1.17"
-    "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.17"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
+"@storybook/addons@6.3.12", "@storybook/addons@^6.3.0", "@storybook/addons@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.3.12.tgz#8773dcc113c5086dfff722388b7b65580e43b65b"
+  integrity sha512-UgoMyr7Qr0FS3ezt8u6hMEcHgyynQS9ucr5mAwZky3wpXRPFyUTmMto9r4BBUdqyUvTUj/LRKIcmLBfj+/l0Fg==
+  dependencies:
+    "@storybook/api" "6.3.12"
+    "@storybook/channels" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/router" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    core-js "^3.8.2"
+    global "^4.4.0"
     regenerator-runtime "^0.13.7"
-    store2 "^2.7.1"
-    telejson "^5.0.2"
-    ts-dedent "^2.0.0"
-    util-deprecate "^1.0.2"
 
-"@storybook/api@6.3.4", "@storybook/api@^6.1.7":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.3.4.tgz#25b8b842104693000b018b3f64986e95fa032b45"
-  integrity sha512-12q6dvSR4AtyuZbKAy3Xt+ZHzZ4ePPRV1q20xtgYBoiFEgB9vbh4XKEeeZD0yIeTamQ2x1Hn87R79Rs1GIdKRQ==
+"@storybook/api@6.3.12", "@storybook/api@^6.3.0", "@storybook/api@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.3.12.tgz#2845c20464d5348d676d09665e8ab527825ed7b5"
+  integrity sha512-LScRXUeCWEW/OP+jiooNMQICVdusv7azTmULxtm72fhkXFRiQs2CdRNTiqNg46JLLC9z95f1W+pGK66X6HiiQA==
   dependencies:
     "@reach/router" "^1.3.4"
-    "@storybook/channels" "6.3.4"
-    "@storybook/client-logger" "6.3.4"
-    "@storybook/core-events" "6.3.4"
+    "@storybook/channels" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/core-events" "6.3.12"
     "@storybook/csf" "0.0.1"
-    "@storybook/router" "6.3.4"
+    "@storybook/router" "6.3.12"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.3.4"
+    "@storybook/theming" "6.3.12"
     "@types/reach__router" "^1.3.7"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
@@ -3571,112 +4872,145 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/channel-postmessage@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.1.17.tgz#309ce67c94637ec13319d4ce360a8f3742ddbaf4"
-  integrity sha512-2nVqxq4oZdSITqhFOnkh1rmDMjCwHuobnK5Fp3l7ftCkbmiZHMheKK9Tz4Rb803dhXvcGYs0zRS8NjKyxlOLsA==
-  dependencies:
-    "@storybook/channels" "6.1.17"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    qs "^6.6.0"
-    telejson "^5.0.2"
-
-"@storybook/channels@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.1.17.tgz#2cc89a6b9727d19c24b15fa3cb15569b469db864"
-  integrity sha512-MUdj0eKr/AbxevHTSXX7AsgxAz6e5O4ZxoYX5G8ggoqSXrWzws6zRFmUmmTdjpIvVmP2M1Kh4SYFAKcS/AGw9w==
-  dependencies:
-    core-js "^3.0.1"
+"@storybook/builder-webpack4@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.3.12.tgz#288d541e2801892721c975259476022da695dbfe"
+  integrity sha512-Dlm5Fc1svqpFDnVPZdAaEBiM/IDZHMV3RfEGbUTY/ZC0q8b/Ug1czzp/w0aTIjOFRuBDcG6IcplikaqHL8CJLg==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
+    "@babel/plugin-proposal-export-default-from" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/channel-postmessage" "6.3.12"
+    "@storybook/channels" "6.3.12"
+    "@storybook/client-api" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/core-common" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/node-logger" "6.3.12"
+    "@storybook/router" "6.3.12"
+    "@storybook/semver" "^7.3.2"
+    "@storybook/theming" "6.3.12"
+    "@storybook/ui" "6.3.12"
+    "@types/node" "^14.0.10"
+    "@types/webpack" "^4.41.26"
+    autoprefixer "^9.8.6"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^2.8.0"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    core-js "^3.8.2"
+    css-loader "^3.6.0"
+    dotenv-webpack "^1.8.0"
+    file-loader "^6.2.0"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^4.1.6"
+    fs-extra "^9.0.1"
+    glob "^7.1.6"
+    glob-promise "^3.4.0"
+    global "^4.4.0"
+    html-webpack-plugin "^4.0.0"
+    pnp-webpack-plugin "1.6.4"
+    postcss "^7.0.36"
+    postcss-flexbugs-fixes "^4.2.1"
+    postcss-loader "^4.2.0"
+    raw-loader "^4.0.2"
+    react-dev-utils "^11.0.3"
+    stable "^0.1.8"
+    style-loader "^1.3.0"
+    terser-webpack-plugin "^4.2.3"
     ts-dedent "^2.0.0"
+    url-loader "^4.1.1"
     util-deprecate "^1.0.2"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
+    webpack-filter-warnings-plugin "^1.2.1"
+    webpack-hot-middleware "^2.25.0"
+    webpack-virtual-modules "^0.2.2"
 
-"@storybook/channels@6.3.4":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.3.4.tgz#425b31a67e42ac66ccb03465e4ba2e2ef9c8344b"
-  integrity sha512-zdZzBbIu9JHEe+uw8FqKsNUiFY+iqI9QdHH/pM3DTTQpBN/JM1Xwfo3CkqA8c5PkhSGqpW0YjXoPash4lawr1Q==
+"@storybook/channel-postmessage@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.3.12.tgz#3ff9412ac0f445e3b8b44dd414e783a5a47ff7c1"
+  integrity sha512-Ou/2Ga3JRTZ/4sSv7ikMgUgLTeZMsXXWLXuscz4oaYhmOqAU9CrJw0G1NitwBgK/+qC83lEFSLujHkWcoQDOKg==
+  dependencies:
+    "@storybook/channels" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    qs "^6.10.0"
+    telejson "^5.3.2"
+
+"@storybook/channels@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.3.12.tgz#aa0d793895a8b211f0ad3459c61c1bcafd0093c7"
+  integrity sha512-l4sA+g1PdUV8YCbgs47fIKREdEQAKNdQIZw0b7BfTvY9t0x5yfBywgQhYON/lIeiNGz2OlIuD+VUtqYfCtNSyw==
   dependencies:
     core-js "^3.8.2"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-api@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.1.17.tgz#3ced22f08a47af70ccf8929111bc44b79e9e8ec0"
-  integrity sha512-Loz/wdh0axgq0PS19tx0tGEFEkFWlYc6YauJGHjygYa1xX7mJ54hDoaTolySCXN1HtfZn08D847yjGSN2oIqVg==
+"@storybook/client-api@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.3.12.tgz#a0c6d72a871d1cb02b4b98675472839061e39b5b"
+  integrity sha512-xnW+lKKK2T774z+rOr9Wopt1aYTStfb86PSs9p3Fpnc2Btcftln+C3NtiHZl8Ccqft8Mz/chLGgewRui6tNI8g==
   dependencies:
-    "@storybook/addons" "6.1.17"
-    "@storybook/channel-postmessage" "6.1.17"
-    "@storybook/channels" "6.1.17"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/core-events" "6.1.17"
+    "@storybook/addons" "6.3.12"
+    "@storybook/channel-postmessage" "6.3.12"
+    "@storybook/channels" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/core-events" "6.3.12"
     "@storybook/csf" "0.0.1"
-    "@types/qs" "^6.9.0"
-    "@types/webpack-env" "^1.15.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
+    "@types/qs" "^6.9.5"
+    "@types/webpack-env" "^1.16.0"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
     memoizerific "^1.11.3"
-    qs "^6.6.0"
+    qs "^6.10.0"
     regenerator-runtime "^0.13.7"
     stable "^0.1.8"
-    store2 "^2.7.1"
+    store2 "^2.12.0"
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/client-logger@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.1.17.tgz#0d89aaf824457f19bf9aa585bbcada57595e7d01"
-  integrity sha512-oqExrxhmws0ihB47sjdynZHd3OpUP4KWkx4udG+74lYIvBH+EZmQ9xF+UofeY3j5p1I9k8ugEcVKy0sqh1yR3w==
-  dependencies:
-    core-js "^3.0.1"
-    global "^4.3.2"
-
-"@storybook/client-logger@6.3.4":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.3.4.tgz#c7ee70463c48bb3af704165d5456351ebb667fc2"
-  integrity sha512-Gu4M5bBHHQznsdoj8uzYymeojwWq+CRNsUUH41BQIND/RJYSX1IYGIj0yNBP449nv2pjHcTGlN8NJDd+PcELCQ==
+"@storybook/client-logger@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.3.12.tgz#6585c98923b49fcb25dbceeeb96ef2a83e28e0f4"
+  integrity sha512-zNDsamZvHnuqLznDdP9dUeGgQ9TyFh4ray3t1VGO7ZqWVZ2xtVCCXjDvMnOXI2ifMpX5UsrOvshIPeE9fMBmiQ==
   dependencies:
     core-js "^3.8.2"
     global "^4.4.0"
 
-"@storybook/components@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.1.17.tgz#f92d36e370ec6039d8c7cee9ef13dda866eed3da"
-  integrity sha512-rIEll0UTxEKmG4IsSS5K+6DjRLVtX8J+9cg79GSAC7N1ZHUR1UQmjjJaehJa5q/NQ5H8C39acxpT4Py/BcsL2g==
-  dependencies:
-    "@popperjs/core" "^2.5.4"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.1.17"
-    "@types/overlayscrollbars" "^1.9.0"
-    "@types/react-color" "^3.0.1"
-    "@types/react-syntax-highlighter" "11.0.4"
-    core-js "^3.0.1"
-    fast-deep-equal "^3.1.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    markdown-to-jsx "^6.11.4"
-    memoizerific "^1.11.3"
-    overlayscrollbars "^1.10.2"
-    polished "^3.4.4"
-    react-color "^2.17.0"
-    react-popper-tooltip "^3.1.1"
-    react-syntax-highlighter "^13.5.0"
-    react-textarea-autosize "^8.1.1"
-    ts-dedent "^2.0.0"
-
-"@storybook/components@^6.1.7":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.3.4.tgz#c872ec267edf315eaada505be8595c70eb6db09b"
-  integrity sha512-0hBKTkkQbW+daaA6nRedkviPr2bEzy1kwq0H5eaLKI1zYeXN3U5Z8fVhO137PPqH5LmLietrmTPkqiljUBk9ug==
+"@storybook/components@6.3.12", "@storybook/components@^6.3.0", "@storybook/components@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.3.12.tgz#0c7967c60354c84afa20dfab4753105e49b1927d"
+  integrity sha512-kdQt8toUjynYAxDLrJzuG7YSNL6as1wJoyzNUaCfG06YPhvIAlKo7le9tS2mThVFN5e9nbKrW3N1V1sp6ypZXQ==
   dependencies:
     "@popperjs/core" "^2.6.0"
-    "@storybook/client-logger" "6.3.4"
+    "@storybook/client-logger" "6.3.12"
     "@storybook/csf" "0.0.1"
-    "@storybook/theming" "6.3.4"
+    "@storybook/theming" "6.3.12"
     "@types/color-convert" "^2.0.0"
     "@types/overlayscrollbars" "^1.12.0"
     "@types/react-syntax-highlighter" "11.0.5"
@@ -3698,191 +5032,275 @@
     ts-dedent "^2.0.0"
     util-deprecate "^1.0.2"
 
-"@storybook/core-events@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.1.17.tgz#697ed916fcb2a411bc9f8bdbfacd0eb9d394eb58"
-  integrity sha512-xBI7kmyROcqhYNmFv4QBjD77CzV+k/0F051YFS5WicEI4qDWPPvzaShhm96ZrGobUX3+di4pC11gqdsrFeNCEg==
-  dependencies:
-    core-js "^3.0.1"
-
-"@storybook/core-events@6.3.4":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.3.4.tgz#f841b8659a8729d334acd9a6dcfc470c88a2be8f"
-  integrity sha512-6qI5bU5VcAoRfxkvpdRqO16eYrX5M0P2E3TakqUUDcgDo5Rfcwd1wTTcwiXslMIh7oiVGiisA+msKTlfzyKf9Q==
+"@storybook/core-client@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.3.12.tgz#fd01bfbc69c331f4451973a4e7597624dc3737e5"
+  integrity sha512-8Smd9BgZHJpAdevLKQYinwtjSyCZAuBMoetP4P5hnn53mWl0NFbrHFaAdT+yNchDLZQUbf7Y18VmIqEH+RCR5w==
   dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/channel-postmessage" "6.3.12"
+    "@storybook/client-api" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/csf" "0.0.1"
+    "@storybook/ui" "6.3.12"
+    airbnb-js-shims "^2.2.1"
+    ansi-to-html "^0.6.11"
     core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
+    qs "^6.10.0"
+    regenerator-runtime "^0.13.7"
+    ts-dedent "^2.0.0"
+    unfetch "^4.2.0"
+    util-deprecate "^1.0.2"
 
-"@storybook/core@6.1.17", "@storybook/core@^6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.1.17.tgz#21c3d2c23fcaac4b930c9413f396d158aaeb7546"
-  integrity sha512-9x8ezlKlm8SQ+OW3kKwJwuVcaTDCw2OlA9YZEOo1kdRKsiiy5X14VqjJocl/BqnDt2VgzUUchz3m4neHYMAivQ==
+"@storybook/core-common@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.3.12.tgz#95ce953d7efda44394b159322d6a2280c202f21c"
+  integrity sha512-xlHs2QXELq/moB4MuXjYOczaxU64BIseHsnFBLyboJYN6Yso3qihW5RB7cuJlGohkjb4JwY74dvfT4Ww66rkBA==
   dependencies:
-    "@babel/core" "^7.12.3"
+    "@babel/core" "^7.12.10"
     "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-decorators" "^7.12.1"
+    "@babel/plugin-proposal-decorators" "^7.12.12"
     "@babel/plugin-proposal-export-default-from" "^7.12.1"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
     "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
     "@babel/plugin-proposal-private-methods" "^7.12.1"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.12"
     "@babel/plugin-transform-classes" "^7.12.1"
     "@babel/plugin-transform-destructuring" "^7.12.1"
     "@babel/plugin-transform-for-of" "^7.12.1"
     "@babel/plugin-transform-parameters" "^7.12.1"
     "@babel/plugin-transform-shorthand-properties" "^7.12.1"
     "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/preset-env" "^7.12.1"
-    "@babel/preset-react" "^7.12.1"
-    "@babel/preset-typescript" "^7.12.1"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/preset-react" "^7.12.10"
+    "@babel/preset-typescript" "^7.12.7"
     "@babel/register" "^7.12.1"
-    "@storybook/addons" "6.1.17"
-    "@storybook/api" "6.1.17"
-    "@storybook/channel-postmessage" "6.1.17"
-    "@storybook/channels" "6.1.17"
-    "@storybook/client-api" "6.1.17"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/components" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    "@storybook/csf" "0.0.1"
-    "@storybook/node-logger" "6.1.17"
-    "@storybook/router" "6.1.17"
+    "@storybook/node-logger" "6.3.12"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.17"
-    "@storybook/ui" "6.1.17"
     "@types/glob-base" "^0.3.0"
     "@types/micromatch" "^4.0.1"
-    "@types/node-fetch" "^2.5.4"
-    airbnb-js-shims "^2.2.1"
-    ansi-to-html "^0.6.11"
-    autoprefixer "^9.7.2"
-    babel-loader "^8.0.6"
-    babel-plugin-emotion "^10.0.20"
-    babel-plugin-macros "^2.8.0"
-    babel-preset-minify "^0.5.0 || 0.6.0-alpha.5"
-    better-opn "^2.0.0"
-    boxen "^4.1.0"
-    case-sensitive-paths-webpack-plugin "^2.2.0"
-    chalk "^4.0.0"
-    cli-table3 "0.6.0"
-    commander "^5.0.0"
-    core-js "^3.0.1"
-    cpy "^8.1.1"
-    css-loader "^3.5.3"
-    detect-port "^1.3.0"
-    dotenv-webpack "^1.7.0"
-    ejs "^3.1.2"
-    express "^4.17.0"
-    file-loader "^6.0.0"
+    "@types/node" "^14.0.10"
+    "@types/pretty-hrtime" "^1.0.0"
+    babel-loader "^8.2.2"
+    babel-plugin-macros "^3.0.1"
+    babel-plugin-polyfill-corejs3 "^0.1.0"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    express "^4.17.1"
     file-system-cache "^1.0.5"
-    find-up "^4.1.0"
-    fork-ts-checker-webpack-plugin "^4.1.4"
-    fs-extra "^9.0.0"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^6.0.4"
     glob "^7.1.6"
     glob-base "^0.3.0"
-    glob-promise "^3.4.0"
-    global "^4.3.2"
-    html-webpack-plugin "^4.2.1"
-    inquirer "^7.0.0"
-    interpret "^2.0.0"
-    ip "^1.1.5"
-    json5 "^2.1.1"
+    interpret "^2.2.0"
+    json5 "^2.1.3"
     lazy-universal-dotenv "^3.0.1"
     micromatch "^4.0.2"
-    node-fetch "^2.6.0"
-    pkg-dir "^4.2.0"
-    pnp-webpack-plugin "1.6.4"
-    postcss-flexbugs-fixes "^4.1.0"
-    postcss-loader "^3.0.0"
+    pkg-dir "^5.0.0"
     pretty-hrtime "^1.0.3"
-    qs "^6.6.0"
-    raw-loader "^4.0.1"
-    react-dev-utils "^10.0.0"
-    regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
+    ts-dedent "^2.0.0"
+    util-deprecate "^1.0.2"
+    webpack "4"
+
+"@storybook/core-events@6.3.12", "@storybook/core-events@^6.3.0":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.3.12.tgz#73f6271d485ef2576234e578bb07705b92805290"
+  integrity sha512-SXfD7xUUMazaeFkB92qOTUV8Y/RghE4SkEYe5slAdjeocSaH7Nz2WV0rqNEgChg0AQc+JUI66no8L9g0+lw4Gw==
+  dependencies:
+    core-js "^3.8.2"
+
+"@storybook/core-server@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.3.12.tgz#d906f823b263d78a4b087be98810b74191d263cd"
+  integrity sha512-T/Mdyi1FVkUycdyOnhXvoo3d9nYXLQFkmaJkltxBFLzAePAJUSgAsPL9odNC3+p8Nr2/UDsDzvu/Ow0IF0mzLQ==
+  dependencies:
+    "@discoveryjs/json-ext" "^0.5.3"
+    "@storybook/builder-webpack4" "6.3.12"
+    "@storybook/core-client" "6.3.12"
+    "@storybook/core-common" "6.3.12"
+    "@storybook/csf-tools" "6.3.12"
+    "@storybook/manager-webpack4" "6.3.12"
+    "@storybook/node-logger" "6.3.12"
+    "@storybook/semver" "^7.3.2"
+    "@types/node" "^14.0.10"
+    "@types/node-fetch" "^2.5.7"
+    "@types/pretty-hrtime" "^1.0.0"
+    "@types/webpack" "^4.41.26"
+    better-opn "^2.1.1"
+    boxen "^4.2.0"
+    chalk "^4.1.0"
+    cli-table3 "0.6.0"
+    commander "^6.2.1"
+    compression "^1.7.4"
+    core-js "^3.8.2"
+    cpy "^8.1.1"
+    detect-port "^1.3.0"
+    express "^4.17.1"
+    file-system-cache "^1.0.5"
+    fs-extra "^9.0.1"
+    globby "^11.0.2"
+    ip "^1.1.5"
+    node-fetch "^2.6.1"
+    pretty-hrtime "^1.0.3"
+    prompts "^2.4.0"
+    regenerator-runtime "^0.13.7"
     serve-favicon "^2.5.0"
-    shelljs "^0.8.4"
-    stable "^0.1.8"
-    style-loader "^1.2.1"
-    telejson "^5.0.2"
-    terser-webpack-plugin "^3.0.0"
     ts-dedent "^2.0.0"
-    unfetch "^4.1.0"
-    url-loader "^4.0.0"
     util-deprecate "^1.0.2"
-    webpack "^4.44.2"
-    webpack-dev-middleware "^3.7.0"
-    webpack-filter-warnings-plugin "^1.2.1"
-    webpack-hot-middleware "^2.25.0"
-    webpack-virtual-modules "^0.2.2"
+    webpack "4"
+
+"@storybook/core@6.3.12", "@storybook/core@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.3.12.tgz#eb945f7ed5c9039493318bcd2bb5a3a897b91cfd"
+  integrity sha512-FJm2ns8wk85hXWKslLWiUWRWwS9KWRq7jlkN6M9p57ghFseSGr4W71Orcoab4P3M7jI97l5yqBfppbscinE74g==
+  dependencies:
+    "@storybook/core-client" "6.3.12"
+    "@storybook/core-server" "6.3.12"
+
+"@storybook/csf-tools@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.3.12.tgz#d979c6a79d1e9d6c8b5a5e8834d07fcf5b793844"
+  integrity sha512-wNrX+99ajAXxLo0iRwrqw65MLvCV6SFC0XoPLYrtBvyKr+hXOOnzIhO2f5BNEii8velpC2gl2gcLKeacpVYLqA==
+  dependencies:
+    "@babel/generator" "^7.12.11"
+    "@babel/parser" "^7.12.11"
+    "@babel/plugin-transform-react-jsx" "^7.12.12"
+    "@babel/preset-env" "^7.12.11"
+    "@babel/traverse" "^7.12.11"
+    "@babel/types" "^7.12.11"
+    "@mdx-js/mdx" "^1.6.22"
+    "@storybook/csf" "^0.0.1"
+    core-js "^3.8.2"
+    fs-extra "^9.0.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.20"
+    prettier "~2.2.1"
+    regenerator-runtime "^0.13.7"
 
-"@storybook/csf@0.0.1":
+"@storybook/csf@0.0.1", "@storybook/csf@^0.0.1":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.1.tgz#95901507dc02f0bc6f9ac8ee1983e2fc5bb98ce6"
   integrity sha512-USTLkZze5gkel8MYCujSRBVIrUQ3YPBrLOx7GNk/0wttvVtlzWXAq9eLbQ4p/NicGxP+3T7KPEMVV//g+yubpw==
   dependencies:
     lodash "^4.17.15"
 
-"@storybook/node-logger@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.1.17.tgz#468e65c9f0c103d4b0cd7f5da945af81e9aaa3d4"
-  integrity sha512-Z0xQ4kzvf7GnwFG9UY1HJO2UR66t8IBnC5GxvWrJ/kwXE+DRF3mm/MT41Zz/d9zAY5Vo4mhE5zRwlYSAtrxQIQ==
+"@storybook/manager-webpack4@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.3.12.tgz#1c10a60b0acec3f9136dd8b7f22a25469d8b91e5"
+  integrity sha512-OkPYNrHXg2yZfKmEfTokP6iKx4OLTr0gdI5yehi/bLEuQCSHeruxBc70Dxm1GBk1Mrf821wD9WqMXNDjY5Qtug==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/preset-react" "^7.12.10"
+    "@storybook/addons" "6.3.12"
+    "@storybook/core-client" "6.3.12"
+    "@storybook/core-common" "6.3.12"
+    "@storybook/node-logger" "6.3.12"
+    "@storybook/theming" "6.3.12"
+    "@storybook/ui" "6.3.12"
+    "@types/node" "^14.0.10"
+    "@types/webpack" "^4.41.26"
+    babel-loader "^8.2.2"
+    case-sensitive-paths-webpack-plugin "^2.3.0"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
+    css-loader "^3.6.0"
+    dotenv-webpack "^1.8.0"
+    express "^4.17.1"
+    file-loader "^6.2.0"
+    file-system-cache "^1.0.5"
+    find-up "^5.0.0"
+    fs-extra "^9.0.1"
+    html-webpack-plugin "^4.0.0"
+    node-fetch "^2.6.1"
+    pnp-webpack-plugin "1.6.4"
+    read-pkg-up "^7.0.1"
+    regenerator-runtime "^0.13.7"
+    resolve-from "^5.0.0"
+    style-loader "^1.3.0"
+    telejson "^5.3.2"
+    terser-webpack-plugin "^4.2.3"
+    ts-dedent "^2.0.0"
+    url-loader "^4.1.1"
+    util-deprecate "^1.0.2"
+    webpack "4"
+    webpack-dev-middleware "^3.7.3"
+    webpack-virtual-modules "^0.2.2"
+
+"@storybook/node-logger@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.3.12.tgz#a67cfbe266d2692f317914ef583721627498df19"
+  integrity sha512-iktOem/Ls2+dsZY9PhPeC6T1QhX/y7OInP88neLsqEPEbB2UXca3Ydv7OZBhBVbvN25W45b05MRzbtNUxYLNRw==
   dependencies:
     "@types/npmlog" "^4.1.2"
-    chalk "^4.0.0"
-    core-js "^3.0.1"
+    chalk "^4.1.0"
+    core-js "^3.8.2"
     npmlog "^4.1.2"
     pretty-hrtime "^1.0.3"
 
-"@storybook/react@^6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.1.17.tgz#cb48386d435984d7ca58a24e686a72159367077b"
-  integrity sha512-gBylKDuwUzWueB6mEhTo72SelWU3vPWHAFsi+NK6zWFIc2a5dJc9QqDfN+2rBhVOdRXqhSHzYwNWurqYpWuqew==
+"@storybook/postinstall@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.3.12.tgz#ed98caff76d8c1a1733ec630565ef4162b274614"
+  integrity sha512-HkZ+abtZ3W6JbGPS6K7OSnNXbwaTwNNd5R02kRs4gV9B29XsBPDtFT6vIwzM3tmVQC7ihL5a8ceWp2OvzaNOuw==
+  dependencies:
+    core-js "^3.8.2"
+
+"@storybook/react-docgen-typescript-plugin@1.0.2-canary.253f8c1.0":
+  version "1.0.2-canary.253f8c1.0"
+  resolved "https://registry.yarnpkg.com/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.2-canary.253f8c1.0.tgz#f2da40e6aae4aa586c2fb284a4a1744602c3c7fa"
+  integrity sha512-mmoRG/rNzAiTbh+vGP8d57dfcR2aP+5/Ll03KKFyfy5FqWFm/Gh7u27ikx1I3LmVMI8n6jh5SdWMkMKon7/tDw==
+  dependencies:
+    debug "^4.1.1"
+    endent "^2.0.1"
+    find-cache-dir "^3.3.1"
+    flat-cache "^3.0.4"
+    micromatch "^4.0.2"
+    react-docgen-typescript "^2.0.0"
+    tslib "^2.0.0"
+
+"@storybook/react@^6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.3.12.tgz#2e172cbfc06f656d2890743dcf49741a10fa1629"
+  integrity sha512-c1Y/3/eNzye+ZRwQ3BXJux6pUMVt3lhv1/M9Qagl9JItP3jDSj5Ed3JHCgwEqpprP8mvNNXwEJ8+M7vEQyDuHg==
   dependencies:
     "@babel/preset-flow" "^7.12.1"
-    "@babel/preset-react" "^7.12.1"
-    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.2"
-    "@storybook/addons" "6.1.17"
-    "@storybook/core" "6.1.17"
-    "@storybook/node-logger" "6.1.17"
+    "@babel/preset-react" "^7.12.10"
+    "@pmmmwh/react-refresh-webpack-plugin" "^0.4.3"
+    "@storybook/addons" "6.3.12"
+    "@storybook/core" "6.3.12"
+    "@storybook/core-common" "6.3.12"
+    "@storybook/node-logger" "6.3.12"
+    "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.253f8c1.0"
     "@storybook/semver" "^7.3.2"
-    "@types/webpack-env" "^1.15.3"
+    "@types/webpack-env" "^1.16.0"
     babel-plugin-add-react-displayname "^0.0.5"
     babel-plugin-named-asset-import "^0.3.1"
     babel-plugin-react-docgen "^4.2.1"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
+    core-js "^3.8.2"
+    global "^4.4.0"
+    lodash "^4.17.20"
     prop-types "^15.7.2"
-    react-dev-utils "^10.0.0"
-    react-docgen-typescript-plugin "^0.6.2"
+    react-dev-utils "^11.0.3"
     react-refresh "^0.8.3"
+    read-pkg-up "^7.0.1"
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
-    webpack "^4.44.2"
-
-"@storybook/router@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.1.17.tgz#96746878c50c6c97c7de5a1b23a9503c5d648775"
-  integrity sha512-wLqSOB5yLXgNyDGy008RUvjVRtVMq7lhmMRicSIxgJpkakPrMRN8n/nK7pxgQc/xDTphnS0u1nT01i97WszhCg==
-  dependencies:
-    "@reach/router" "^1.3.3"
-    "@types/reach__router" "^1.3.7"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
+    webpack "4"
 
-"@storybook/router@6.3.4":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.3.4.tgz#f38ec8064a9d1811a68558390727c30220fe7d72"
-  integrity sha512-cNG2bT0BBfqJyaW6xKUnEB/XXSdMkYeI9ShwJ2gh/2Bnidm7eZ/RKUOZ4q5equMm+SxxyZgpBulqnFN+TqPbOA==
+"@storybook/router@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.3.12.tgz#0d572ec795f588ca886f39cb9b27b94ff3683f84"
+  integrity sha512-G/pNGCnrJRetCwyEZulHPT+YOcqEj/vkPVDTUfii2qgqukup6K0cjwgd7IukAURnAnnzTi1gmgFuEKUi8GE/KA==
   dependencies:
     "@reach/router" "^1.3.4"
-    "@storybook/client-logger" "6.3.4"
+    "@storybook/client-logger" "6.3.12"
     "@types/reach__router" "^1.3.7"
     core-js "^3.8.2"
     fast-deep-equal "^3.1.3"
@@ -3900,10 +5318,26 @@
     core-js "^3.6.5"
     find-up "^4.1.0"
 
-"@storybook/storybook-deployer@^2.8.7":
-  version "2.8.7"
-  resolved "https://registry.yarnpkg.com/@storybook/storybook-deployer/-/storybook-deployer-2.8.7.tgz#c1eed33d03bd9267f884c60eea8e03dc3261ec11"
-  integrity sha512-O0hKHV6hg93fPMvKGC5M/sd7KTL473+SzMKm+WZNVEyLEfXXcVU+Ts9/VL1IhmC1P2A8Bg9oBnkcPqAqjAN46w==
+"@storybook/source-loader@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.3.12.tgz#86e72824c04ad0eaa89b807857bd845db97e57bd"
+  integrity sha512-Lfe0LOJGqAJYkZsCL8fhuQOeFSCgv8xwQCt4dkcBd0Rw5zT2xv0IXDOiIOXGaWBMDtrJUZt/qOXPEPlL81Oaqg==
+  dependencies:
+    "@storybook/addons" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/csf" "0.0.1"
+    core-js "^3.8.2"
+    estraverse "^5.2.0"
+    global "^4.4.0"
+    loader-utils "^2.0.0"
+    lodash "^4.17.20"
+    prettier "~2.2.1"
+    regenerator-runtime "^0.13.7"
+
+"@storybook/storybook-deployer@^2.8.10":
+  version "2.8.10"
+  resolved "https://registry.yarnpkg.com/@storybook/storybook-deployer/-/storybook-deployer-2.8.10.tgz#3cf96aea823d424fbfce98e76fca108d07470ec2"
+  integrity sha512-2uleH0AFuI98sdTkbyHt1BgPa0kmLxhC3zwfwtacE8FB+2ffdRdqBlp6GYDZ7CZ+R4B4XuPYhsgUKWkB+zngyQ==
   dependencies:
     git-url-parse "^11.1.2"
     glob "^7.1.3"
@@ -3911,33 +5345,15 @@
     shelljs "^0.8.1"
     yargs "^15.0.0"
 
-"@storybook/theming@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.1.17.tgz#99cc120a230c30458d833b40c806b9b4dff7b34a"
-  integrity sha512-LpRuY2aIh2td+qZi7E8cp2oM88LudNMmTsBT6N2/Id69u/a9qQd2cYCA9k9fAsg7rjor+wR/N695jk3SGtoFTw==
-  dependencies:
-    "@emotion/core" "^10.1.1"
-    "@emotion/is-prop-valid" "^0.8.6"
-    "@emotion/styled" "^10.0.23"
-    "@storybook/client-logger" "6.1.17"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.19"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.4.4"
-    resolve-from "^5.0.0"
-    ts-dedent "^2.0.0"
-
-"@storybook/theming@6.3.4":
-  version "6.3.4"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.3.4.tgz#69d3f912c74a7b6ba78c1c95fac3315356468bdd"
-  integrity sha512-L0lJcwUi7mse+U7EBAv5NVt81mH1MtUzk9paik8hMAc68vDtR/X0Cq4+zPsgykCROOTtEGrQ/JUUrpcEqeprTQ==
+"@storybook/theming@6.3.12", "@storybook/theming@^6.3.0":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.3.12.tgz#5bddf9bd90a60709b5ab238ecdb7d9055dd7862e"
+  integrity sha512-wOJdTEa/VFyFB2UyoqyYGaZdym6EN7RALuQOAMT6zHA282FBmKw8nL5DETHEbctpnHdcrMC/391teK4nNSrdOA==
   dependencies:
     "@emotion/core" "^10.1.1"
     "@emotion/is-prop-valid" "^0.8.6"
     "@emotion/styled" "^10.0.27"
-    "@storybook/client-logger" "6.3.4"
+    "@storybook/client-logger" "6.3.12"
     core-js "^3.8.2"
     deep-object-diff "^1.1.0"
     emotion-theming "^10.0.27"
@@ -3947,41 +5363,40 @@
     resolve-from "^5.0.0"
     ts-dedent "^2.0.0"
 
-"@storybook/ui@6.1.17":
-  version "6.1.17"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.1.17.tgz#c29e7a03c645dd94793a3cbd587fcb6e0ba0f22e"
-  integrity sha512-D4Vri1MmqfmNq+g1hSRqZyld5zX2VLUexQHGSPmNj+FhlOzkeNA5RcoMBWMvIUSUENiBx3a5gmr/6cbXo7ljdQ==
+"@storybook/ui@6.3.12":
+  version "6.3.12"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.3.12.tgz#349e1a4c58c4fd18ea65b2ab56269a7c3a164ee7"
+  integrity sha512-PC2yEz4JMfarq7rUFbeA3hCA+31p5es7YPEtxLRvRwIZhtL0P4zQUfHpotb3KgWdoAIfZesAuoIQwMPQmEFYrw==
   dependencies:
     "@emotion/core" "^10.1.1"
-    "@storybook/addons" "6.1.17"
-    "@storybook/api" "6.1.17"
-    "@storybook/channels" "6.1.17"
-    "@storybook/client-logger" "6.1.17"
-    "@storybook/components" "6.1.17"
-    "@storybook/core-events" "6.1.17"
-    "@storybook/router" "6.1.17"
+    "@storybook/addons" "6.3.12"
+    "@storybook/api" "6.3.12"
+    "@storybook/channels" "6.3.12"
+    "@storybook/client-logger" "6.3.12"
+    "@storybook/components" "6.3.12"
+    "@storybook/core-events" "6.3.12"
+    "@storybook/router" "6.3.12"
     "@storybook/semver" "^7.3.2"
-    "@storybook/theming" "6.1.17"
-    "@types/markdown-to-jsx" "^6.11.0"
-    copy-to-clipboard "^3.0.8"
-    core-js "^3.0.1"
-    core-js-pure "^3.0.1"
-    downshift "^6.0.6"
-    emotion-theming "^10.0.19"
+    "@storybook/theming" "6.3.12"
+    "@types/markdown-to-jsx" "^6.11.3"
+    copy-to-clipboard "^3.3.1"
+    core-js "^3.8.2"
+    core-js-pure "^3.8.2"
+    downshift "^6.0.15"
+    emotion-theming "^10.0.27"
     fuse.js "^3.6.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
+    global "^4.4.0"
+    lodash "^4.17.20"
     markdown-to-jsx "^6.11.4"
     memoizerific "^1.11.3"
-    polished "^3.4.4"
-    qs "^6.6.0"
-    react-draggable "^4.0.3"
-    react-helmet-async "^1.0.2"
-    react-hotkeys "2.0.0"
-    react-sizeme "^2.6.7"
+    polished "^4.0.5"
+    qs "^6.10.0"
+    react-draggable "^4.4.3"
+    react-helmet-async "^1.0.7"
+    react-sizeme "^3.0.1"
     regenerator-runtime "^0.13.7"
     resolve-from "^5.0.0"
-    store2 "^2.7.1"
+    store2 "^2.12.0"
 
 "@stylelint/postcss-css-in-js@^0.37.1":
   version "0.37.2"
@@ -4288,6 +5703,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
   integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
 
+"@types/json-schema@^7.0.4":
+  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"
@@ -4303,13 +5723,20 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
   integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
 
-"@types/markdown-to-jsx@^6.11.0":
+"@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"
   integrity sha512-30nFYpceM/ZEvhGiqWjm5quLUxNeld0HCzJEXMZZDpq53FPkS85mTwkWtCXzCqq8s5JYLgM5W392a02xn8Bdaw==
   dependencies:
     "@types/react" "*"
 
+"@types/mdast@^3.0.0":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af"
+  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/micromatch@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.1.tgz#9381449dd659fc3823fd2a4190ceacc985083bc7"
@@ -4332,10 +5759,10 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
-"@types/node-fetch@^2.5.4":
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c"
-  integrity sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==
+"@types/node-fetch@^2.5.7":
+  version "2.5.12"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
+  integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
@@ -4350,6 +5777,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
   integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
 
+"@types/node@^14.0.10":
+  version "14.17.27"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.27.tgz#5054610d37bb5f6e21342d0e6d24c494231f3b85"
+  integrity sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw==
+
 "@types/node@^8.10.11":
   version "8.10.48"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.48.tgz#e385073561643a9ba6199a1985ffc03530f90781"
@@ -4370,16 +5802,16 @@
   resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.1.tgz#fb637071b545834fb12aea94ee309a2ff4cdc0a8"
   integrity sha512-V25YHbSoKQN35UasHf0EKD9U2vcmexRSp78qa8UglxFH8H3D+adEa9zGZwrqpH4TdvqeMrgMqVqsLB4woAryrQ==
 
-"@types/overlayscrollbars@^1.9.0":
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz#98456caceca8ad73bd5bb572632a585074e70764"
-  integrity sha512-h/pScHNKi4mb+TrJGDon8Yb06ujFG0mSg12wIO0sWMUF3dQIe2ExRRdNRviaNt9IjxIiOfnRr7FsQAdHwK4sMg==
-
 "@types/parse-json@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
+"@types/parse5@^5.0.0":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
+  integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
+
 "@types/pbkdf2@^3.0.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/pbkdf2/-/pbkdf2-3.1.0.tgz#039a0e9b67da0cdc4ee5dab865caa6b267bb66b1"
@@ -4397,15 +5829,20 @@
   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"
+  integrity sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==
+
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
-"@types/qs@^6.9.0":
-  version "6.9.5"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b"
-  integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==
+"@types/qs@^6.9.5":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
 "@types/reach__router@^1.3.7":
   version "1.3.7"
@@ -4414,20 +5851,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-color@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.1.tgz#5433e2f503ea0e0831cbc6fd0c20f8157d93add0"
-  integrity sha512-J6mYm43Sid9y+OjZ7NDfJ2VVkeeuTPNVImNFITgQNXodHteKfl/t/5pAR5Z9buodZ2tCctsZjgiMlQOpfntakw==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-syntax-highlighter@11.0.4":
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"
-  integrity sha512-9GfTo3a0PHwQeTVoqs0g5bS28KkSY48pp5659wA+Dp4MqceDEa8EHBqrllJvvtyusszyJhViUEap0FDvlk/9Zg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-syntax-highlighter@11.0.5":
   version "11.0.5"
   resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.5.tgz#0d546261b4021e1f9d85b50401c0a42acb106087"
@@ -4486,6 +5909,11 @@
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
   integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
 
+"@types/tapable@^1":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
+  integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
+
 "@types/testing-library__jest-dom@^5.9.1":
   version "5.9.5"
   resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.5.tgz#5bf25c91ad2d7b38f264b12275e5c92a66d849b0"
@@ -4513,15 +5941,20 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
+"@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==
+
 "@types/uuid@^8.3.0":
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f"
   integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
 
-"@types/webpack-env@^1.15.3":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.0.tgz#8c0a9435dfa7b3b1be76562f3070efb3f92637b4"
-  integrity sha512-Fx+NpfOO0CpeYX2g9bkvX8O5qh9wrU1sOF4g8sft4Mu7z+qfe387YlyY8w8daDyDsKY5vUxM0yxkAYnbkRbZEw==
+"@types/webpack-env@^1.16.0":
+  version "1.16.3"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a"
+  integrity sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw==
 
 "@types/webpack-sources@*":
   version "2.0.0"
@@ -4532,6 +5965,18 @@
     "@types/source-list-map" "*"
     source-map "^0.7.3"
 
+"@types/webpack@^4.41.26":
+  version "4.41.31"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa"
+  integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==
+  dependencies:
+    "@types/node" "*"
+    "@types/tapable" "^1"
+    "@types/uglify-js" "*"
+    "@types/webpack-sources" "*"
+    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"
@@ -4840,19 +6285,7 @@
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/wast-parser" "1.9.0"
-    "@xtuc/long" "4.2.2"
-
-"@webpack-contrib/schema-utils@^1.0.0-beta.0":
-  version "1.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz#bf9638c9464d177b48209e84209e23bee2eb4f65"
-  integrity sha512-LonryJP+FxQQHsjGBi6W786TQB1Oym+agTpY0c+Kj8alnIw+DLUJb6SI8Y1GHGhLCH1yPRrucjObUmxNICQ1pg==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chalk "^2.3.2"
-    strip-ansi "^4.0.0"
-    text-table "^0.2.0"
-    webpack-log "^1.1.2"
+    "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -4968,7 +6401,7 @@ abstract-logging@^1.0.0:
   resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-1.0.0.tgz#8b7deafd310559bc28f77724dd1bb30177278c1b"
   integrity sha1-i33q/TEFWbwo93ck3RuzAXcnjBs=
 
-accepts@^1.3.5, accepts@~1.3.4, accepts@~1.3.7:
+accepts@^1.3.5, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
   integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
@@ -5029,12 +6462,21 @@ acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2:
     acorn-walk "^6.1.0"
     xtend "^4.0.1"
 
+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==
+  dependencies:
+    acorn "^7.0.0"
+    acorn-walk "^7.0.0"
+    xtend "^4.0.2"
+
 acorn-walk@^6.0.1, acorn-walk@^6.1.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
-acorn-walk@^7.1.1:
+acorn-walk@^7.0.0, acorn-walk@^7.1.1, acorn-walk@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
@@ -5054,15 +6496,15 @@ acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7, acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0:
+acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0, acorn@^7.4.1:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz#52311fd7037ae119cbb134309e901aa46295b3fe"
-  integrity sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==
+acorn@^8.2.4:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+  integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
 
 addons-linter@1.14.0:
   version "1.14.0"
@@ -5249,7 +6691,7 @@ ajv@^4.7.0:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -5445,7 +6887,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.0, anymatch@^3.0.3, anymatch@^3.1.0, 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==
@@ -5999,7 +7441,7 @@ autoprefixer@^8.0.0:
     postcss "^6.0.19"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^9.7.2, autoprefixer@^9.8.0:
+autoprefixer@^9.8.0:
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.5.tgz#2c225de229ddafe1d1424c02791d0c3e10ccccaa"
   integrity sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==
@@ -6012,6 +7454,19 @@ autoprefixer@^9.7.2, autoprefixer@^9.8.0:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.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==
+  dependencies:
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001109"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    picocolors "^0.2.1"
+    postcss "^7.0.32"
+    postcss-value-parser "^4.1.0"
+
 available-typed-arrays@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz#9e0ae84ecff20caae6a94a1c3bc39b955649b7a9"
@@ -6032,6 +7487,11 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+axe-core@^4.2.0:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.3.tgz#b55cd8e8ddf659fe89b064680e1c6a4dceab0325"
+  integrity sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA==
+
 axios-retry@^3.0.2:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.1.8.tgz#ffcfed757e1fab8cbf832f8505bb0e0af47c520c"
@@ -6046,7 +7506,7 @@ axios@^0.19.2, axios@^0.21.2:
   dependencies:
     follow-redirects "^1.14.0"
 
-babel-code-frame@^6.16.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
@@ -6123,11 +7583,6 @@ babel-helper-define-map@^6.24.1:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-helper-evaluate-path@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.5.0.tgz#a62fa9c4e64ff7ea5cea9353174ef023a900a67c"
-  integrity sha512-mUh0UhS607bGh5wUMAQfOpt2JX2ThXMtppHRdRU1kL7ZLRWIXxoV2UIV1r2cAeeNeU1M5SB5/RSUgUxrK8yOkA==
-
 babel-helper-explode-assignable-expression@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
@@ -6137,11 +7592,6 @@ babel-helper-explode-assignable-expression@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-flip-expressions@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.4.3.tgz#3696736a128ac18bc25254b5f40a22ceb3c1d3fd"
-  integrity sha1-NpZzahKKwYvCUlS19AoizrPB0/0=
-
 babel-helper-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
@@ -6169,21 +7619,6 @@ babel-helper-hoist-variables@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-helper-is-nodes-equiv@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz#34e9b300b1479ddd98ec77ea0bbe9342dfe39684"
-  integrity sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=
-
-babel-helper-is-void-0@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-is-void-0/-/babel-helper-is-void-0-0.4.3.tgz#7d9c01b4561e7b95dbda0f6eee48f5b60e67313e"
-  integrity sha1-fZwBtFYee5Xb2g9u7kj1tg5nMT4=
-
-babel-helper-mark-eval-scopes@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.4.3.tgz#d244a3bef9844872603ffb46e22ce8acdf551562"
-  integrity sha1-0kSjvvmESHJgP/tG4izorN9VFWI=
-
 babel-helper-optimise-call-expression@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
@@ -6212,11 +7647,6 @@ babel-helper-remap-async-to-generator@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-remove-or-void@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.4.3.tgz#a4f03b40077a0ffe88e45d07010dee241ff5ae60"
-  integrity sha1-pPA7QAd6D/6I5F0HAQ3uJB/1rmA=
-
 babel-helper-replace-supers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
@@ -6229,11 +7659,6 @@ babel-helper-replace-supers@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-helper-to-multiple-sequence-expressions@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
-  integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==
-
 babel-helpers@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
@@ -6256,15 +7681,15 @@ babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@^8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
-  integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
+babel-loader@^8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
   dependencies:
-    find-cache-dir "^2.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
-    pify "^4.0.1"
+    find-cache-dir "^3.3.1"
+    loader-utils "^1.4.0"
+    make-dir "^3.1.0"
+    schema-utils "^2.6.5"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -6278,6 +7703,14 @@ babel-plugin-add-react-displayname@^0.0.5:
   resolved "https://registry.yarnpkg.com/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
   integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=
 
+babel-plugin-apply-mdx-type-prop@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b"
+  integrity sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "7.10.4"
+    "@mdx-js/util" "1.6.22"
+
 babel-plugin-check-es2015-constants@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
@@ -6292,7 +7725,7 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
+babel-plugin-emotion@^10.0.27:
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.27.tgz#59001cf5de847c1d61f2079cd906a90a00d3184f"
   integrity sha512-SUNYcT4FqhOqvwv0z1oeYhqgheU8qrceLojuHyX17ngo7WtWqN5I9l3IGHzf21Xraj465CVzF4IvOlAF+3ed0A==
@@ -6308,6 +7741,13 @@ babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
     find-root "^1.1.0"
     source-map "^0.5.7"
 
+babel-plugin-extract-import-names@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc"
+  integrity sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "7.10.4"
+
 babel-plugin-istanbul@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
@@ -6338,84 +7778,51 @@ babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0:
     cosmiconfig "^6.0.0"
     resolve "^1.12.0"
 
-babel-plugin-minify-builtins@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-builtins/-/babel-plugin-minify-builtins-0.5.0.tgz#31eb82ed1a0d0efdc31312f93b6e4741ce82c36b"
-  integrity sha512-wpqbN7Ov5hsNwGdzuzvFcjgRlzbIeVv1gMIlICbPj0xkexnfoIDe7q+AZHMkQmAE/F9R5jkrB6TLfTegImlXag==
-
-babel-plugin-minify-constant-folding@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.5.0.tgz#f84bc8dbf6a561e5e350ff95ae216b0ad5515b6e"
-  integrity sha512-Vj97CTn/lE9hR1D+jKUeHfNy+m1baNiJ1wJvoGyOBUx7F7kJqDZxr9nCHjO/Ad+irbR3HzR6jABpSSA29QsrXQ==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-minify-dead-code-elimination@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.5.0.tgz#d23ef5445238ad06e8addf5c1cf6aec835bcda87"
-  integrity sha512-XQteBGXlgEoAKc/BhO6oafUdT4LBa7ARi55mxoyhLHNuA+RlzRmeMAfc31pb/UqU01wBzRc36YqHQzopnkd/6Q==
+babel-plugin-macros@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1"
+  integrity sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==
   dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-    babel-helper-mark-eval-scopes "^0.4.3"
-    babel-helper-remove-or-void "^0.4.3"
-    lodash.some "^4.6.0"
+    "@babel/runtime" "^7.12.5"
+    cosmiconfig "^7.0.0"
+    resolve "^1.19.0"
 
-babel-plugin-minify-flip-comparisons@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.4.3.tgz#00ca870cb8f13b45c038b3c1ebc0f227293c965a"
-  integrity sha1-AMqHDLjxO0XAOLPB68DyJyk8llo=
-  dependencies:
-    babel-helper-is-void-0 "^0.4.3"
+babel-plugin-named-asset-import@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.2.tgz#20978ed446b8e1bf4a2f42d0a94c0ece85f75f4f"
+  integrity sha512-CxwvxrZ9OirpXQ201Ec57OmGhmI8/ui/GwTDy0hSp6CmRvgRC0pSair6Z04Ck+JStA0sMPZzSJ3uE4n17EXpPQ==
 
-babel-plugin-minify-guarded-expressions@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.4.3.tgz#cc709b4453fd21b1f302877444c89f88427ce397"
-  integrity sha1-zHCbRFP9IbHzAod0RMifiEJ845c=
+babel-plugin-polyfill-corejs2@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
+  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
   dependencies:
-    babel-helper-flip-expressions "^0.4.3"
-
-babel-plugin-minify-infinity@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.4.3.tgz#dfb876a1b08a06576384ef3f92e653ba607b39ca"
-  integrity sha1-37h2obCKBldjhO8/kuZTumB7Oco=
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    semver "^6.1.1"
 
-babel-plugin-minify-mangle-names@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.5.0.tgz#bcddb507c91d2c99e138bd6b17a19c3c271e3fd3"
-  integrity sha512-3jdNv6hCAw6fsX1p2wBGPfWuK69sfOjfd3zjUXkbq8McbohWy23tpXfy5RnToYWggvqzuMOwlId1PhyHOfgnGw==
+babel-plugin-polyfill-corejs3@^0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0"
+  integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==
   dependencies:
-    babel-helper-mark-eval-scopes "^0.4.3"
-
-babel-plugin-minify-numeric-literals@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.4.3.tgz#8e4fd561c79f7801286ff60e8c5fd9deee93c0bc"
-  integrity sha1-jk/VYcefeAEob/YOjF/Z3u6TwLw=
+    "@babel/helper-define-polyfill-provider" "^0.1.5"
+    core-js-compat "^3.8.1"
 
-babel-plugin-minify-replace@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.5.0.tgz#d3e2c9946c9096c070efc96761ce288ec5c3f71c"
-  integrity sha512-aXZiaqWDNUbyNNNpWs/8NyST+oU7QTpK7J9zFEFSA0eOmtUNMU3fczlTTTlnCxHmq/jYNFEmkkSG3DDBtW3Y4Q==
-
-babel-plugin-minify-simplify@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.5.0.tgz#1f090018afb90d8b54d3d027fd8a4927f243da6f"
-  integrity sha512-TM01J/YcKZ8XIQd1Z3nF2AdWHoDsarjtZ5fWPDksYZNsoOjQ2UO2EWm824Ym6sp127m44gPlLFiO5KFxU8pA5Q==
+babel-plugin-polyfill-corejs3@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
+  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
   dependencies:
-    babel-helper-flip-expressions "^0.4.3"
-    babel-helper-is-nodes-equiv "^0.0.1"
-    babel-helper-to-multiple-sequence-expressions "^0.5.0"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    core-js-compat "^3.16.2"
 
-babel-plugin-minify-type-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.4.3.tgz#1bc6f15b87f7ab1085d42b330b717657a2156500"
-  integrity sha1-G8bxW4f3qxCF1CszC3F2V6IVZQA=
+babel-plugin-polyfill-regenerator@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
+  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
   dependencies:
-    babel-helper-is-void-0 "^0.4.3"
-
-babel-plugin-named-asset-import@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.2.tgz#20978ed446b8e1bf4a2f42d0a94c0ece85f75f4f"
-  integrity sha512-CxwvxrZ9OirpXQ201Ec57OmGhmI8/ui/GwTDy0hSp6CmRvgRC0pSair6Z04Ck+JStA0sMPZzSJ3uE4n17EXpPQ==
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
 
 babel-plugin-react-docgen@^4.2.1:
   version "4.2.1"
@@ -6654,33 +8061,6 @@ babel-plugin-transform-exponentiation-operator@^6.22.0:
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-inline-consecutive-adds@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.4.3.tgz#323d47a3ea63a83a7ac3c811ae8e6941faf2b0d1"
-  integrity sha1-Mj1Ho+pjqDp6w8gRro5pQfrysNE=
-
-babel-plugin-transform-member-expression-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.9.4.tgz#37039c9a0c3313a39495faac2ff3a6b5b9d038bf"
-  integrity sha1-NwOcmgwzE6OUlfqsL/OmtbnQOL8=
-
-babel-plugin-transform-merge-sibling-variables@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.9.4.tgz#85b422fc3377b449c9d1cde44087203532401dae"
-  integrity sha1-hbQi/DN3tEnJ0c3kQIcgNTJAHa4=
-
-babel-plugin-transform-minify-booleans@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.9.4.tgz#acbb3e56a3555dd23928e4b582d285162dd2b198"
-  integrity sha1-rLs+VqNVXdI5KOS1gtKFFi3SsZg=
-
-babel-plugin-transform-property-literals@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.9.4.tgz#98c1d21e255736573f93ece54459f6ce24985d39"
-  integrity sha1-mMHSHiVXNlc/k+zlRFn2ziSYXTk=
-  dependencies:
-    esutils "^2.0.2"
-
 babel-plugin-transform-regenerator@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
@@ -6688,33 +8068,6 @@ babel-plugin-transform-regenerator@^6.22.0:
   dependencies:
     regenerator-transform "^0.10.0"
 
-babel-plugin-transform-regexp-constructors@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.4.3.tgz#58b7775b63afcf33328fae9a5f88fbd4fb0b4965"
-  integrity sha1-WLd3W2OvzzMyj66aX4j71PsLSWU=
-
-babel-plugin-transform-remove-console@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz#b980360c067384e24b357a588d807d3c83527780"
-  integrity sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=
-
-babel-plugin-transform-remove-debugger@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.9.4.tgz#42b727631c97978e1eb2d199a7aec84a18339ef2"
-  integrity sha1-QrcnYxyXl44estGZp67IShgznvI=
-
-babel-plugin-transform-remove-undefined@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.5.0.tgz#80208b31225766c630c97fa2d288952056ea22dd"
-  integrity sha512-+M7fJYFaEE/M9CXa0/IRkDbiV3wRELzA1kKQFCJ4ifhrzLKn/9VCCgj9OFmYWwBd8IB48YdgPkHYtbYq+4vtHQ==
-  dependencies:
-    babel-helper-evaluate-path "^0.5.0"
-
-babel-plugin-transform-simplify-comparison-operators@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.9.4.tgz#f62afe096cab0e1f68a2d753fdf283888471ceb9"
-  integrity sha1-9ir+CWyrDh9ootdT/fKDiIRxzrk=
-
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
@@ -6723,11 +8076,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-undefined-to-void@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.9.4.tgz#be241ca81404030678b748717322b89d0c8fe280"
-  integrity sha1-viQcqBQEAwZ4t0hxcyK4nQyP4oA=
-
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
@@ -6790,35 +8138,6 @@ babel-preset-jest@^26.6.2:
     babel-plugin-jest-hoist "^26.6.2"
     babel-preset-current-node-syntax "^1.0.0"
 
-"babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-minify/-/babel-preset-minify-0.5.0.tgz#e25bb8d3590087af02b650967159a77c19bfb96b"
-  integrity sha512-xj1s9Mon+RFubH569vrGCayA9Fm2GMsCgDRm1Jb8SgctOB7KFcrVc2o8K3YHUyMz+SWP8aea75BoS8YfsXXuiA==
-  dependencies:
-    babel-plugin-minify-builtins "^0.5.0"
-    babel-plugin-minify-constant-folding "^0.5.0"
-    babel-plugin-minify-dead-code-elimination "^0.5.0"
-    babel-plugin-minify-flip-comparisons "^0.4.3"
-    babel-plugin-minify-guarded-expressions "^0.4.3"
-    babel-plugin-minify-infinity "^0.4.3"
-    babel-plugin-minify-mangle-names "^0.5.0"
-    babel-plugin-minify-numeric-literals "^0.4.3"
-    babel-plugin-minify-replace "^0.5.0"
-    babel-plugin-minify-simplify "^0.5.0"
-    babel-plugin-minify-type-constructors "^0.4.3"
-    babel-plugin-transform-inline-consecutive-adds "^0.4.3"
-    babel-plugin-transform-member-expression-literals "^6.9.4"
-    babel-plugin-transform-merge-sibling-variables "^6.9.4"
-    babel-plugin-transform-minify-booleans "^6.9.4"
-    babel-plugin-transform-property-literals "^6.9.4"
-    babel-plugin-transform-regexp-constructors "^0.4.3"
-    babel-plugin-transform-remove-console "^6.9.4"
-    babel-plugin-transform-remove-debugger "^6.9.4"
-    babel-plugin-transform-remove-undefined "^0.5.0"
-    babel-plugin-transform-simplify-comparison-operators "^6.9.4"
-    babel-plugin-transform-undefined-to-void "^6.9.4"
-    lodash.isplainobject "^4.0.6"
-
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
@@ -7032,7 +8351,12 @@ bech32@^1.1.2:
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.3.tgz#bd47a8986bbb3eec34a56a097a84b8d3e9a2dfcd"
   integrity sha512-yuVFUvrNcoJi0sv5phmqc6P+Fl1HjRDRNOOkHY2X/3LBy2bIGNSFx4fZ95HMaXHupuS7cZR15AsvtmCIF4UEyg==
 
-better-opn@^2.0.0:
+bech32@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/bech32/-/bech32-2.0.0.tgz#078d3686535075c8c79709f054b1b226a133b355"
+  integrity sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==
+
+better-opn@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6"
   integrity sha512-kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==
@@ -7186,6 +8510,11 @@ bitcoinjs-lib@^5.0.0:
     varuint-bitcoin "^1.0.4"
     wif "^2.0.1"
 
+bitwise@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/bitwise/-/bitwise-2.1.0.tgz#1853fac76500c86da01e3819150a4edf92a7abdb"
+  integrity sha512-XKgAhMXCh4H/3oNwAHAsAO0iC89s9cOiumgYwSHjSobGWxYjv62YhkL9QEdvGP151xypCtMlAfKK79GEcd2eRQ==
+
 bl@^1.0.0, bl@^1.2.1:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
@@ -7327,6 +8656,19 @@ borc@^2.1.0:
     iso-url "~0.4.4"
     json-text-sequence "~0.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==
+  dependencies:
+    bignumber.js "^9.0.0"
+    buffer "^5.5.0"
+    commander "^2.15.0"
+    ieee754 "^1.1.13"
+    iso-url "~0.4.7"
+    json-text-sequence "~0.1.0"
+    readable-stream "^3.6.0"
+
 bowser@^2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
@@ -7359,7 +8701,7 @@ boxen@^3.0.0:
     type-fest "^0.3.0"
     widest-line "^2.0.0"
 
-boxen@^4.1.0:
+boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
   integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==
@@ -7464,6 +8806,13 @@ browser-resolve@^1.11.0, browser-resolve@^1.7.0:
   dependencies:
     resolve "1.1.7"
 
+browser-resolve@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-2.0.0.tgz#99b7304cb392f8d73dba741bb2d7da28c6d7842b"
+  integrity sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==
+  dependencies:
+    resolve "^1.17.0"
+
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
@@ -7540,7 +8889,7 @@ browserify-zlib@^0.2.0, browserify-zlib@~0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserify@^16.1.0, browserify@^16.5.1:
+browserify@^16.5.1:
   version "16.5.1"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.5.1.tgz#3c13c97436802930d5c3ae28658ddc33bfd37dc2"
   integrity sha512-EQX0h59Pp+0GtSRb5rL6OTfrttlzv+uyaUVlK6GX3w11SQ0jKPKyjC/54RhPR2ib2KmfcELM06e8FxcI5XNU2A==
@@ -7594,15 +8943,69 @@ browserify@^16.1.0, browserify@^16.5.1:
     vm-browserify "^1.0.0"
     xtend "^4.0.0"
 
-browserslist@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
-  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
+browserify@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-17.0.0.tgz#4c48fed6c02bfa2b51fd3b670fddb805723cdc22"
+  integrity sha512-SaHqzhku9v/j6XsQMRxPyBrSP3gnwmE27gLJYZgMT2GeK3J0+0toN+MnuNYDfHwVGQfLiMZ7KSNSIXHemy905w==
+  dependencies:
+    JSONStream "^1.0.3"
+    assert "^1.4.0"
+    browser-pack "^6.0.1"
+    browser-resolve "^2.0.0"
+    browserify-zlib "~0.2.0"
+    buffer "~5.2.1"
+    cached-path-relative "^1.0.0"
+    concat-stream "^1.6.0"
+    console-browserify "^1.1.0"
+    constants-browserify "~1.0.0"
+    crypto-browserify "^3.0.0"
+    defined "^1.0.0"
+    deps-sort "^2.0.1"
+    domain-browser "^1.2.0"
+    duplexer2 "~0.1.2"
+    events "^3.0.0"
+    glob "^7.1.0"
+    has "^1.0.0"
+    htmlescape "^1.1.0"
+    https-browserify "^1.0.0"
+    inherits "~2.0.1"
+    insert-module-globals "^7.2.1"
+    labeled-stream-splicer "^2.0.0"
+    mkdirp-classic "^0.5.2"
+    module-deps "^6.2.3"
+    os-browserify "~0.3.0"
+    parents "^1.0.1"
+    path-browserify "^1.0.0"
+    process "~0.11.0"
+    punycode "^1.3.2"
+    querystring-es3 "~0.2.0"
+    read-only-stream "^2.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.4"
+    shasum-object "^1.0.0"
+    shell-quote "^1.6.1"
+    stream-browserify "^3.0.0"
+    stream-http "^3.0.0"
+    string_decoder "^1.1.1"
+    subarg "^1.0.0"
+    syntax-error "^1.1.1"
+    through2 "^2.0.0"
+    timers-browserify "^1.0.1"
+    tty-browserify "0.0.1"
+    url "~0.11.0"
+    util "~0.12.0"
+    vm-browserify "^1.0.0"
+    xtend "^4.0.0"
+
+browserslist@4.14.2:
+  version "4.14.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.2.tgz#1b3cec458a1ba87588cc5e9be62f19b6d48813ce"
+  integrity sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==
   dependencies:
-    caniuse-lite "^1.0.30001035"
-    electron-to-chromium "^1.3.378"
-    node-releases "^1.1.52"
-    pkg-up "^3.1.0"
+    caniuse-lite "^1.0.30001125"
+    electron-to-chromium "^1.3.564"
+    escalade "^3.0.2"
+    node-releases "^1.1.61"
 
 browserslist@^3.1.1, browserslist@^3.2.6:
   version "3.2.8"
@@ -7623,6 +9026,17 @@ browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.7:
     escalade "^3.1.1"
     node-releases "^1.1.66"
 
+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==
+  dependencies:
+    caniuse-lite "^1.0.30001265"
+    electron-to-chromium "^1.3.867"
+    escalade "^3.1.1"
+    node-releases "^2.0.0"
+    picocolors "^1.0.0"
+
 bs58@4.0.1, bs58@^4.0.0, bs58@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a"
@@ -7739,7 +9153,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.0.5, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.0.5, 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==
@@ -7903,7 +9317,7 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
-cached-path-relative@^1.0.0:
+cached-path-relative@^1.0.0, cached-path-relative@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db"
   integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==
@@ -7969,6 +9383,11 @@ camel-case@^4.1.1:
     pascal-case "^3.1.1"
     tslib "^1.10.0"
 
+camelcase-css@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
+  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
+
 camelcase-keys@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
@@ -8008,7 +9427,7 @@ camelcase@^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.30001035, caniuse-lite@^1.0.30001097, caniuse-lite@^1.0.30001157:
+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:
   version "1.0.30001265"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz#0613c9e6c922e422792e6fcefdf9a3afeee4f8c3"
   integrity sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==
@@ -8025,10 +9444,10 @@ capture-stack-trace@^1.0.0:
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
   integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
-case-sensitive-paths-webpack-plugin@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz#3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"
-  integrity sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g==
+case-sensitive-paths-webpack-plugin@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
+  integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -8207,7 +9626,7 @@ chokidar@3.3.0:
   optionalDependencies:
     fsevents "~2.1.1"
 
-"chokidar@>=2.0.0 <4.0.0", chokidar@^3.3.0, chokidar@^3.4.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==
@@ -8222,7 +9641,7 @@ chokidar@3.3.0:
   optionalDependencies:
     fsevents "~2.3.1"
 
-"chokidar@>=3.0.0 <4.0.0":
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, 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==
@@ -8237,7 +9656,7 @@ chokidar@3.3.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^2.0.0, chokidar@^2.1.1, chokidar@^2.1.8:
+chokidar@^2.0.0, chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
@@ -8273,10 +9692,10 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@^93.0.1:
-  version "93.0.1"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-93.0.1.tgz#3ed1f7baa98a754fc1788c42ac8e4bb1ab27db32"
-  integrity sha512-KDzbW34CvQLF5aTkm3b5VdlTrvdIt4wEpCzT2p4XJIQWQZEPco5pNce7Lu9UqZQGkhQ4mpZt4Ky6NKVyIS2N8A==
+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==
   dependencies:
     "@testim/chrome-version" "^1.0.7"
     axios "^0.21.2"
@@ -8411,13 +9830,6 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
 cli-table3@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz#b7b1bc65ca8e7b5cef9124e13dc2b21e2ce4faee"
@@ -8552,7 +9964,7 @@ cloneable-readable@^1.0.0:
     process-nextick-args "^1.0.6"
     through2 "^2.0.1"
 
-clsx@^1.0.4:
+clsx@^1.0.4, clsx@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
   integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
@@ -8712,12 +10124,7 @@ commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^6.1.0:
+commander@^6.1.0, commander@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
@@ -8764,10 +10171,30 @@ compose-function@3.0.3:
   dependencies:
     arity-n "^1.0.4"
 
-compute-scroll-into-view@^1.0.14:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz#5b7bf4f7127ea2c19b750353d7ce6776a90ee088"
-  integrity sha512-a85LHKY81oQnikatZYA90pufpZ6sQx++BoCxOEMsjpZx+ZnaKGQnCyCehTRr/1p9GBIAHTjcU9k71kSYWloLiQ==
+compressible@~2.0.16:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
+  dependencies:
+    mime-db ">= 1.43.0 < 2"
+
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+compute-scroll-into-view@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"
+  integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -8987,6 +10414,13 @@ copy-to-clipboard@^3.0.8:
   dependencies:
     toggle-selection "^1.0.3"
 
+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==
+  dependencies:
+    toggle-selection "^1.0.6"
+
 copy-webpack-plugin@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz#2b3d2bfc6861b96432a65f0149720adbd902040b"
@@ -9004,6 +10438,14 @@ copy-webpack-plugin@^6.0.3:
     serialize-javascript "^4.0.0"
     webpack-sources "^1.4.3"
 
+core-js-compat@^3.16.0, core-js-compat@^3.16.2, core-js-compat@^3.8.1:
+  version "3.18.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.3.tgz#e0e7e87abc55efb547e7fa19169e45fa9df27a67"
+  integrity sha512-4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw==
+  dependencies:
+    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"
@@ -9017,12 +10459,17 @@ core-js-pure@^3.0.0, core-js-pure@^3.0.1:
   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:
+  version "3.18.3"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.18.3.tgz#7eed77dcce1445ab68fd68715856633e2fb3b90c"
+  integrity sha512-qfskyO/KjtbYn09bn1IPkuhHl5PlJ6IzJ9s9sraJ1EqcuGyLGKzhSM1cY0zgyL9hx42eulQLZ6WaeK5ycJCkqw==
+
 core-js@^2.4.0, core-js@^2.5.0:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-js@^3.0.1, core-js@^3.0.4, core-js@^3.6.5:
+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==
@@ -9045,16 +10492,6 @@ cors@^2.8.1:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
 cosmiconfig@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
@@ -9184,10 +10621,10 @@ cross-fetch@^3.0.6:
   dependencies:
     node-fetch "2.6.1"
 
-cross-spawn@7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
-  integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
+cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -9213,15 +10650,6 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
 crypt@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
@@ -9271,7 +10699,7 @@ css-loader@^2.1.1:
     postcss-value-parser "^3.3.0"
     schema-utils "^1.0.0"
 
-css-loader@^3.5.3:
+css-loader@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
   integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
@@ -9918,6 +11346,16 @@ deps-sort@^2.0.0:
     subarg "^1.0.0"
     through2 "^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==
+  dependencies:
+    JSONStream "^1.0.3"
+    shasum-object "^1.0.0"
+    subarg "^1.0.0"
+    through2 "^2.0.0"
+
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -9931,6 +11369,13 @@ destroy@^1.0.4, destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
+detab@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43"
+  integrity sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==
+  dependencies:
+    repeat-string "^1.5.4"
+
 detect-browser@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97"
@@ -10070,6 +11515,15 @@ detective@^5.0.2:
     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"
+  integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==
+  dependencies:
+    acorn-node "^1.6.1"
+    defined "^1.0.0"
+    minimist "^1.1.1"
+
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -10149,14 +11603,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
-  dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
 dir-glob@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -10270,7 +11716,7 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
-dom-helpers@^3.2.0, dom-helpers@^3.4.0:
+dom-helpers@^3.2.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
   integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
@@ -10370,10 +11816,10 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
-dotenv-webpack@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.7.0.tgz#4384d8c57ee6f405c296278c14a9f9167856d3a1"
-  integrity sha512-wwNtOBW/6gLQSkb8p43y0Wts970A3xtNiG/mpwj9MLUhtPCQG6i+/DSXXoNN7fbPCU/vQ7JjwGmgOeGZSSZnsw==
+dotenv-webpack@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/dotenv-webpack/-/dotenv-webpack-1.8.0.tgz#7ca79cef2497dd4079d43e81e0796bc9d0f68a5e"
+  integrity sha512-o8pq6NLBehtrqA8Jv8jFQNtG9nhRtVqmoD4yWbgUyoU3+9WBlPe+c2EAiaJok9RB28QvrWvdWLZGeTT5aATDMg==
   dependencies:
     dotenv-defaults "^1.0.2"
 
@@ -10387,15 +11833,16 @@ dotenv@^8.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-downshift@^6.0.6:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.0.6.tgz#82aee8e2e260d7ad99df8a0969bd002dd523abe8"
-  integrity sha512-tmLab3cXCn6PtZYl9V8r/nB2m+7/nCNrwo0B3kTHo/2lRBHr+1en1VNOQt2wIt0ajanAnxquZ00WPCyxe6cNFQ==
+downshift@^6.0.15:
+  version "6.1.7"
+  resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.7.tgz#fdb4c4e4f1d11587985cd76e21e8b4b3fa72e44c"
+  integrity sha512-cVprZg/9Lvj/uhYRxELzlu1aezRcgPWBjTvspiGTVEU64gF5pRdSRKFVLcxqsZC637cLAGMbL40JavEfWnqgNg==
   dependencies:
-    "@babel/runtime" "^7.11.2"
-    compute-scroll-into-view "^1.0.14"
+    "@babel/runtime" "^7.14.8"
+    compute-scroll-into-view "^1.0.17"
     prop-types "^15.7.2"
-    react-is "^16.13.1"
+    react-is "^17.0.2"
+    tslib "^2.3.0"
 
 drbg.js@^1.0.1:
   version "1.0.1"
@@ -10472,18 +11919,23 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^3.0.2, ejs@^3.1.2:
+ejs@^3.0.2:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b"
   integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==
   dependencies:
     jake "^10.6.1"
 
-electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.591:
+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:
+  version "1.3.871"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.871.tgz#6e87365fd72037a6c898fb46050ad4be3ac9ef62"
+  integrity sha512-qcLvDUPf8DSIMWarHT2ptgcqrYg62n3vPA7vhrOF24d8UNzbUBaHu2CySiENR3nEDzYgaN60071t0F6KLYMQ7Q==
+
 electron@^11.1.0:
   version "11.4.12"
   resolved "https://registry.yarnpkg.com/electron/-/electron-11.4.12.tgz#3315ce63a37cea5033125f7abcfdcc2f76864a57"
@@ -10493,10 +11945,10 @@ electron@^11.1.0:
     "@types/node" "^12.0.12"
     extract-zip "^1.0.3"
 
-element-resize-detector@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.1.tgz#b0305194447a4863155e58f13323a0aef30851d1"
-  integrity sha512-BdFsPepnQr9fznNPF9nF4vQ457U/ZJXQDSNF1zBe7yaga8v9AdZf3/NElYxFdUh7SitSGt040QygiTo6dtatIw==
+element-resize-detector@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.3.tgz#5078d9b99398fe4c589f8c8df94ff99e5d413ff3"
+  integrity sha512-+dhNzUgLpq9ol5tyhoG7YLoXL3ssjfFW+0gpszXPwRU6NjGr1fVHMEAF8fVzIiRJq57Nre0RFeIjJwI8Nh2NmQ==
   dependencies:
     batch-processor "1.0.0"
 
@@ -10538,7 +11990,7 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-emotion-theming@^10.0.19, emotion-theming@^10.0.27:
+emotion-theming@^10.0.27:
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.27.tgz#1887baaec15199862c89b1b984b79806f2b9ab10"
   integrity sha512-MlF1yu/gYh8u+sLUqA0YuA9JX0P4Hb69WlKc/9OLo+WCXuX6sy/KoIa+qJimgmr2dWqnypYKYPX37esjDBbhdw==
@@ -10645,6 +12097,15 @@ enhanced-resolve@^4.3.0:
     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"
+  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
 enhanced-resolve@^5.3.2:
   version "5.8.2"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
@@ -10928,7 +12389,7 @@ es6-weak-map@^2.0.1, es6-weak-map@^2.0.2:
     es6-iterator "^2.0.1"
     es6-symbol "^3.1.1"
 
-escalade@^3.1.1:
+escalade@^3.0.2, escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
@@ -11510,6 +12971,21 @@ eth-json-rpc-middleware@^6.0.0:
     pify "^3.0.0"
     safe-event-emitter "^1.0.1"
 
+eth-json-rpc-middleware@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/eth-json-rpc-middleware/-/eth-json-rpc-middleware-8.0.0.tgz#d2a50a5fceca996ddc9d6775d53cf7e341500a88"
+  integrity sha512-G0693ZsEXzERrvE6mb2fevDvSE2gs1ClqFnh/r6/RUYq3y1uzK/5klRsfQvQPCGM9q2FEBKxWYdbIjMZAXWcDQ==
+  dependencies:
+    "@metamask/safe-event-emitter" "^2.0.0"
+    btoa "^1.2.1"
+    clone "^2.1.1"
+    eth-rpc-errors "^4.0.3"
+    eth-sig-util "^1.4.2"
+    json-rpc-engine "^6.1.0"
+    json-stable-stringify "^1.0.1"
+    node-fetch "^2.6.1"
+    pify "^3.0.0"
+
 eth-keyring-controller@^6.1.0, eth-keyring-controller@^6.2.0, eth-keyring-controller@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-6.2.1.tgz#61901071fc74059ed37cb5ae93870fdcae6e3781"
@@ -11525,6 +13001,17 @@ eth-keyring-controller@^6.1.0, eth-keyring-controller@^6.2.0, eth-keyring-contro
     loglevel "^1.5.0"
     obs-store "^4.0.3"
 
+eth-lattice-keyring@^0.3.0:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/eth-lattice-keyring/-/eth-lattice-keyring-0.3.5.tgz#2e0aa5893206c62e4a184c5481abb13c49b07ad2"
+  integrity sha512-HWMfbwO+UCFA4OOuPS2tfY1mqG2u6k0+GLY9us+WLsFJTII6D/NzdN8OBQorYoYG+ce9VEJrJtRPjpOG11ZA1w==
+  dependencies:
+    "@ethereumjs/common" "^2.4.0"
+    "@ethereumjs/tx" "^3.1.1"
+    bignumber.js "^9.0.1"
+    ethereumjs-util "^7.0.10"
+    gridplus-sdk "^0.9.0"
+
 eth-lib@0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.8.tgz#b194058bef4b220ad12ea497431d6cb6aa0623c8"
@@ -11590,6 +13077,13 @@ eth-rpc-errors@^4.0.0, eth-rpc-errors@^4.0.2:
   dependencies:
     fast-safe-stringify "^2.0.6"
 
+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==
+  dependencies:
+    fast-safe-stringify "^2.0.6"
+
 eth-sig-util@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-1.4.2.tgz#8d958202c7edbaae839707fba6f09ff327606210"
@@ -11924,6 +13418,11 @@ ethereumjs-wallet@^1.0.1:
     utf8 "^3.0.0"
     uuid "^3.3.2"
 
+ethers-eip712@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ethers-eip712/-/ethers-eip712-0.2.0.tgz#52973b3a9a22638f7357283bf66624994c6e91ed"
+  integrity sha512-fgS196gCIXeiLwhsWycJJuxI9nL/AoUPGSQ+yvd+8wdWR+43G+J1n69LmWVWvAON0M6qNaf2BF4/M159U8fujQ==
+
 ethers@^4.0.20, ethers@^4.0.28:
   version "4.0.48"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.48.tgz#330c65b8133e112b0613156e57e92d9009d8fbbe"
@@ -12011,6 +13510,42 @@ ethers@^5.4.0, ethers@^5.4.5:
     "@ethersproject/web" "5.4.0"
     "@ethersproject/wordlists" "5.4.0"
 
+ethers@^5.4.2:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.5.1.tgz#d3259a95a42557844aa543906c537106c0406fbf"
+  integrity sha512-RodEvUFZI+EmFcE6bwkuJqpCYHazdzeR1nMzg+YWQSmQEsNtfl1KHGfp/FWZYl48bI/g7cgBeP2IlPthjiVngw==
+  dependencies:
+    "@ethersproject/abi" "5.5.0"
+    "@ethersproject/abstract-provider" "5.5.1"
+    "@ethersproject/abstract-signer" "5.5.0"
+    "@ethersproject/address" "5.5.0"
+    "@ethersproject/base64" "5.5.0"
+    "@ethersproject/basex" "5.5.0"
+    "@ethersproject/bignumber" "5.5.0"
+    "@ethersproject/bytes" "5.5.0"
+    "@ethersproject/constants" "5.5.0"
+    "@ethersproject/contracts" "5.5.0"
+    "@ethersproject/hash" "5.5.0"
+    "@ethersproject/hdnode" "5.5.0"
+    "@ethersproject/json-wallets" "5.5.0"
+    "@ethersproject/keccak256" "5.5.0"
+    "@ethersproject/logger" "5.5.0"
+    "@ethersproject/networks" "5.5.0"
+    "@ethersproject/pbkdf2" "5.5.0"
+    "@ethersproject/properties" "5.5.0"
+    "@ethersproject/providers" "5.5.0"
+    "@ethersproject/random" "5.5.0"
+    "@ethersproject/rlp" "5.5.0"
+    "@ethersproject/sha2" "5.5.0"
+    "@ethersproject/signing-key" "5.5.0"
+    "@ethersproject/solidity" "5.5.0"
+    "@ethersproject/strings" "5.5.0"
+    "@ethersproject/transactions" "5.5.0"
+    "@ethersproject/units" "5.5.0"
+    "@ethersproject/wallet" "5.5.0"
+    "@ethersproject/web" "5.5.0"
+    "@ethersproject/wordlists" "5.5.0"
+
 ethjs-abi@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ethjs-abi/-/ethjs-abi-0.2.0.tgz#d3e2c221011520fc499b71682036c14fcc2f5b25"
@@ -12419,7 +13954,7 @@ explain-error@^1.0.4:
   resolved "https://registry.yarnpkg.com/explain-error/-/explain-error-1.0.4.tgz#a793d3ac0cad4c6ab571e9968fbbab6cb2532929"
   integrity sha1-p5PTrAytTGq1cemWj7urbLJTKSk=
 
-express@^4.14.0, express@^4.17.0:
+express@^4.14.0, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -12606,7 +14141,7 @@ fast-future@~1.0.2:
   resolved "https://registry.yarnpkg.com/fast-future/-/fast-future-1.0.2.tgz#8435a9aaa02d79248d17d704e76259301d99280a"
   integrity sha1-hDWpqqAteSSNF9cE52JZMB2ZKAo=
 
-fast-glob@^2.0.2, fast-glob@^2.2.6:
+fast-glob@^2.2.6:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
   integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
@@ -12743,13 +14278,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-figures@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
-  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
@@ -12772,7 +14300,7 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@^6.0.0:
+file-loader@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
   integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==
@@ -12835,10 +14363,10 @@ filenamify@^4.1.0:
     strip-outer "^1.0.1"
     trim-repeated "^1.0.0"
 
-filesize@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz#f850b509909c7c86f7e450ea19006c31c2ed3d2f"
-  integrity sha512-u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg==
+filesize@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
 
 filesize@^3.6.1:
   version "3.6.1"
@@ -12966,6 +14494,14 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-yarn-workspace-root@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
@@ -13165,21 +14701,7 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz#a1642c0d3e65f50c2cc1742e9c0a80f441f86b19"
-  integrity sha512-DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==
-  dependencies:
-    babel-code-frame "^6.22.0"
-    chalk "^2.4.1"
-    chokidar "^3.3.0"
-    micromatch "^3.1.10"
-    minimatch "^3.0.4"
-    semver "^5.6.0"
-    tapable "^1.0.0"
-    worker-rpc "^0.1.0"
-
-fork-ts-checker-webpack-plugin@^4.1.4:
+fork-ts-checker-webpack-plugin@4.1.6, fork-ts-checker-webpack-plugin@^4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
   integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==
@@ -13192,6 +14714,25 @@ fork-ts-checker-webpack-plugin@^4.1.4:
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
+fork-ts-checker-webpack-plugin@^6.0.4:
+  version "6.3.4"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.3.4.tgz#9af17de0a36caf6f1b4e1d2d081cf586f0a12b14"
+  integrity sha512-z0dns2NXH9NHH0wpW6iuUmyXYRN9BI2Lqnv+RCdL+9GXSW6tKUqYnwf+h3ZaucJsbsrdobdxuOELGgm1xVZITA==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@types/json-schema" "^7.0.5"
+    chalk "^4.1.0"
+    chokidar "^3.4.2"
+    cosmiconfig "^6.0.0"
+    deepmerge "^4.2.2"
+    fs-extra "^9.0.0"
+    glob "^7.1.6"
+    memfs "^3.1.2"
+    minimatch "^3.0.4"
+    schema-utils "2.7.0"
+    semver "^7.3.2"
+    tapable "^1.0.0"
+
 form-data@^2.3.1, form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -13308,6 +14849,16 @@ fs-extra@^9.0.0:
     jsonfile "^6.0.1"
     universalify "^1.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==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-minipass@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -13330,6 +14881,11 @@ fs-mkdirp-stream@^1.0.0:
     graceful-fs "^4.1.11"
     through2 "^2.0.3"
 
+fs-monkey@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
+  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -13685,6 +15241,11 @@ github-from-package@0.0.0:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
 
+github-slugger@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e"
+  integrity sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==
+
 gl-mat4@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/gl-mat4/-/gl-mat4-1.1.4.tgz#1e895b55892e56a896867abd837d38f37a178086"
@@ -13874,7 +15435,7 @@ global-tunnel-ng@^2.7.1:
     npm-conf "^1.1.3"
     tunnel "^0.0.6"
 
-global@^4.3.2, global@^4.4.0:
+global@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
   integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@@ -13921,20 +15482,7 @@ globalthis@^1.0.0, globalthis@^1.0.1:
   dependencies:
     define-properties "^1.1.3"
 
-globby@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
-  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
-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==
@@ -13946,7 +15494,7 @@ globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^11.0.3:
+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==
@@ -14114,6 +15662,27 @@ graphql-request@^1.8.2:
   dependencies:
     cross-fetch "2.2.2"
 
+gridplus-sdk@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/gridplus-sdk/-/gridplus-sdk-0.9.0.tgz#6ed207e83dd0a607e472309a3d785ee2cf20c3cc"
+  integrity sha512-uhxYZ8xiZ5RwLdfZyRCE571I4tdQxsTRU0miaY7A/r+1UW6xS4xSYPYu3azEl0ZJ8sO5awfdDylrim6LMkHe+g==
+  dependencies:
+    aes-js "^3.1.1"
+    bech32 "^2.0.0"
+    bignumber.js "^9.0.1"
+    bitwise "^2.0.4"
+    borc "^2.1.2"
+    bs58check "^2.1.2"
+    buffer "^5.6.0"
+    crc-32 "^1.2.0"
+    elliptic "6.5.4"
+    ethers "^5.4.2"
+    ethers-eip712 "^0.2.0"
+    js-sha3 "^0.8.0"
+    rlp-browser "^1.0.1"
+    secp256k1 "4.0.2"
+    superagent "^3.8.3"
+
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -14488,11 +16057,63 @@ hashlru@^2.3.0:
   resolved "https://registry.yarnpkg.com/hashlru/-/hashlru-2.3.0.tgz#5dc15928b3f6961a2056416bb3a4910216fdfb51"
   integrity sha512-0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A==
 
+hast-to-hyperscript@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d"
+  integrity sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==
+  dependencies:
+    "@types/unist" "^2.0.3"
+    comma-separated-tokens "^1.0.0"
+    property-information "^5.3.0"
+    space-separated-tokens "^1.0.0"
+    style-to-object "^0.3.0"
+    unist-util-is "^4.0.0"
+    web-namespaces "^1.0.0"
+
+hast-util-from-parse5@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a"
+  integrity sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==
+  dependencies:
+    "@types/parse5" "^5.0.0"
+    hastscript "^6.0.0"
+    property-information "^5.0.0"
+    vfile "^4.0.0"
+    vfile-location "^3.2.0"
+    web-namespaces "^1.0.0"
+
 hast-util-parse-selector@^2.0.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a"
   integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==
 
+hast-util-raw@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977"
+  integrity sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    hast-util-from-parse5 "^6.0.0"
+    hast-util-to-parse5 "^6.0.0"
+    html-void-elements "^1.0.0"
+    parse5 "^6.0.0"
+    unist-util-position "^3.0.0"
+    vfile "^4.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
+hast-util-to-parse5@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
+  integrity sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==
+  dependencies:
+    hast-to-hyperscript "^9.0.0"
+    property-information "^5.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
 hastscript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
@@ -14658,17 +16279,22 @@ html-tags@^3.1.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-webpack-plugin@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz#625097650886b97ea5dae331c320e3238f6c121c"
-  integrity sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==
+html-void-elements@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
+  integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==
+
+html-webpack-plugin@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
+  integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
   dependencies:
     "@types/html-minifier-terser" "^5.0.0"
     "@types/tapable" "^1.0.5"
     "@types/webpack" "^4.41.8"
     html-minifier-terser "^5.0.1"
     loader-utils "^1.2.3"
-    lodash "^4.17.15"
+    lodash "^4.17.20"
     pretty-error "^2.1.1"
     tapable "^1.1.3"
     util.promisify "1.0.0"
@@ -14893,7 +16519,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.2.0, ignore@^3.3.5:
+ignore@^3.2.0:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
   integrity sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==
@@ -14918,23 +16544,16 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immer@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
-  integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==
+immer@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656"
+  integrity sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==
 
 immer@^9.0.6:
   version "9.0.6"
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.6.tgz#7a96bf2674d06c8143e327cbf73539388ddf1a73"
   integrity sha512-G95ivKpy+EvVAnAab4fVa4YGYn24J1SpEktnJX7JJ45Bd7xqME/SCplFzYFmTbrkwZbQ4xJK1xMTUYBkN6pWsQ==
 
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
-  dependencies:
-    import-from "^2.1.0"
-
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
@@ -14943,13 +16562,6 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
-  dependencies:
-    resolve-from "^3.0.0"
-
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -15033,24 +16645,10 @@ inline-source-map@~0.6.0:
   dependencies:
     source-map "~0.5.3"
 
-inquirer@7.0.4, inquirer@^7.0.0:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703"
-  integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.15"
-    mute-stream "0.0.8"
-    run-async "^2.2.0"
-    rxjs "^6.5.3"
-    string-width "^4.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
+inline-style-parser@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
+  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
 inquirer@^0.12.0:
   version "0.12.0"
@@ -15106,6 +16704,22 @@ insert-module-globals@^7.0.0:
     undeclared-identifiers "^1.1.2"
     xtend "^4.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==
+  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"
+
 int64-buffer@0.99.1007:
   version "0.99.1007"
   resolved "https://registry.yarnpkg.com/int64-buffer/-/int64-buffer-0.99.1007.tgz#211ea089a2fdb960070a2e77cd6d17dc456a5220"
@@ -15153,10 +16767,10 @@ interpret@^1.0.0, interpret@^1.4.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
-interpret@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.0.0.tgz#b783ffac0b8371503e9ab39561df223286aa5433"
-  integrity sha512-e0/LknJ8wpMMhTiWcjivB+ESwIuvHnBSlBbmP/pSb8CQJldoj1p2qv7xGZ/+BtbTziYRFSz8OsvdbiX45LtYQA==
+interpret@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
+  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 invariant@2, invariant@2.2.4, invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
@@ -15736,6 +17350,11 @@ ipns@~0.5.2:
     protons "^1.0.1"
     timestamp-nano "^1.0.0"
 
+is-absolute-url@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
+  integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
+
 is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
@@ -15758,6 +17377,11 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-alphabetical@1.0.4:
+  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"
@@ -15926,11 +17550,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
 is-docker@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
@@ -16241,6 +17860,11 @@ is-plain-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
+is-plain-object@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"
+  integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -16253,7 +17877,7 @@ is-posix-bracket@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
   integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
-is-potential-custom-element-name@^1.0.0:
+is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
@@ -16502,6 +18126,11 @@ iso-url@~0.4.4, iso-url@~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:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-0.4.7.tgz#de7e48120dae46921079fe78f325ac9e9217a385"
+  integrity sha512-27fFRDnPAMnHGLq36bWTpKET+eiXct3ENlCcdcMdk+mjXrb2kw3mhBUg1B7ewAC0kVzlOPhADzQgz1SE6Tglog==
+
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -16992,7 +18621,7 @@ jest-watcher@^26.6.2:
     jest-util "^26.6.2"
     string-length "^4.0.1"
 
-jest-worker@^26.2.1, jest-worker@^26.6.2:
+jest-worker@^26.5.0, jest-worker@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -17045,6 +18674,11 @@ js-sha3@0.5.7, js-sha3@^0.5.7:
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7"
   integrity sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=
 
+js-sha3@0.8.0, js-sha3@^0.8.0, js-sha3@~0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
+  integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
+
 js-sha3@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.6.1.tgz#5b89f77a7477679877f58c4a075240934b1f95c0"
@@ -17055,10 +18689,10 @@ js-sha3@^0.7.0:
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.7.0.tgz#0a5c57b36f79882573b2d84051f8bb85dd1bd63a"
   integrity sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA==
 
-js-sha3@^0.8.0, js-sha3@~0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
-  integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -17070,7 +18704,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.9.0:
+js-yaml@3.13.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.5.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -17132,12 +18766,12 @@ jsdom@^11.2.0:
     xml-name-validator "^2.0.1"
 
 jsdom@^16.4.0:
-  version "16.5.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.2.tgz#583fac89a0aea31dbf6237e7e4bedccd9beab472"
-  integrity sha512-JxNtPt9C1ut85boCbJmffaQ06NBnzkQY/MWO3YxPW8IWS38A26z+B1oBvA9LwKrytewdfymnhi4UNH3/RAgZrg==
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
   dependencies:
     abab "^2.0.5"
-    acorn "^8.1.0"
+    acorn "^8.2.4"
     acorn-globals "^6.0.0"
     cssom "^0.4.4"
     cssstyle "^2.3.0"
@@ -17145,12 +18779,13 @@ jsdom@^16.4.0:
     decimal.js "^10.2.1"
     domexception "^2.0.1"
     escodegen "^2.0.0"
+    form-data "^3.0.0"
     html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-potential-custom-element-name "^1.0.1"
     nwsapi "^2.2.0"
     parse5 "6.0.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.9"
     saxes "^5.0.1"
     symbol-tree "^3.2.4"
     tough-cookie "^4.0.0"
@@ -17160,7 +18795,7 @@ jsdom@^16.4.0:
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.5.0"
-    ws "^7.4.4"
+    ws "^7.4.6"
     xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
@@ -17319,7 +18954,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.1, json5@^2.1.2:
+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==
@@ -18592,7 +20227,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.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3, loader-utils@^1.1.0, 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==
@@ -18601,7 +20236,7 @@ loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.
     emojis-list "^2.0.0"
     json5 "^1.0.1"
 
-loader-utils@^2.0.0:
+loader-utils@2.0.0, loader-utils@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
   integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
@@ -18610,15 +20245,24 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+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==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
 locale-currency@0.0.1:
   version "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:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.8.1.tgz#f6c0a24b41ab33b10e4dc84342dd696f6f3e3433"
-  integrity sha512-azSSJJfc7h4bVpi0PGi+SmLQKJl2/8NErI+LhJsrORNikMZnhaQ7rv9fHj+ofwgSHrKRlsDCL/639a6nECIKuQ==
+localforage@^1.8.1:
+  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"
 
@@ -18670,6 +20314,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lockfile-lint-api@^5.0.12:
   version "5.0.12"
   resolved "https://registry.yarnpkg.com/lockfile-lint-api/-/lockfile-lint-api-5.0.12.tgz#6ad928126dc2f87762bb520695f58c73a501b7fd"
@@ -18703,6 +20354,11 @@ lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.escape@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
@@ -18773,11 +20429,6 @@ lodash.memoize@~3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
-lodash.some@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-  integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -18793,12 +20444,17 @@ lodash.truncate@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
   integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
 
+lodash.uniq@4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash.uniqby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
   integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@4.17.20, lodash@=3.10.1, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.2:
+lodash@4.17.20, lodash@=3.10.1, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.2:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -18810,7 +20466,7 @@ log-symbols@3.0.0:
   dependencies:
     chalk "^2.4.2"
 
-log-symbols@^2.1.0, log-symbols@^2.2.0:
+log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
@@ -18829,14 +20485,6 @@ loglevel@^1.4.1, loglevel@^1.5.0:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
   integrity sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ=
 
-loglevelnext@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2"
-  integrity sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==
-  dependencies:
-    es6-symbol "^3.1.1"
-    object.assign "^4.1.0"
-
 logplease@^1.2.14, logplease@~1.2.14, logplease@~1.2.15:
   version "1.2.15"
   resolved "https://registry.yarnpkg.com/logplease/-/logplease-1.2.15.tgz#3da442e93751a5992cc19010a826b08d0293c48a"
@@ -18998,7 +20646,7 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -19100,11 +20748,6 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
-material-colors@^1.2.1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.5.tgz#5292593e6754cb1bcc2b98030e4e0d6a3afc9ea1"
-  integrity sha1-UpJZPmdUyxvMK5gDDk4Najr8nqE=
-
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
@@ -19133,6 +20776,13 @@ md5@^2.2.1:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
+mdast-squeeze-paragraphs@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97"
+  integrity sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==
+  dependencies:
+    unist-util-remove "^2.0.0"
+
 mdast-util-compact@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz#cabc69a2f43103628326f35b1acf735d55c99490"
@@ -19140,6 +20790,32 @@ mdast-util-compact@^2.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
+mdast-util-definitions@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2"
+  integrity sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
+mdast-util-to-hast@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
+  integrity sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    mdast-util-definitions "^4.0.0"
+    mdurl "^1.0.0"
+    unist-builder "^2.0.0"
+    unist-util-generated "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
+mdast-util-to-string@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
+  integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
+
 mdn-browser-compat-data@0.0.94:
   version "0.0.94"
   resolved "https://registry.yarnpkg.com/mdn-browser-compat-data/-/mdn-browser-compat-data-0.0.94.tgz#eaa1653761ce95881ea1858a8c0ce6066d85f94b"
@@ -19147,6 +20823,11 @@ mdn-browser-compat-data@0.0.94:
   dependencies:
     extend "3.0.2"
 
+mdurl@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -19194,6 +20875,13 @@ memdown@~3.0.0:
     ltgt "~2.2.0"
     safe-buffer "~5.1.1"
 
+memfs@^3.1.2:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.3.0.tgz#4da2d1fc40a04b170a56622c7164c6be2c4cbef2"
+  integrity sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg==
+  dependencies:
+    fs-monkey "1.0.3"
+
 memoize-one@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
@@ -19406,6 +21094,11 @@ mime-db@1.45.0, mime-db@1.x.x:
   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":
+  version "1.50.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+  integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
+
 mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
@@ -19430,10 +21123,10 @@ mime@1.6.0, mime@^1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.4.2:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
+mime@^2.4.4:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
 mimic-fn@^1.0.0:
   version "1.1.0"
@@ -19678,6 +21371,27 @@ module-deps@^6.0.0:
     through2 "^2.0.0"
     xtend "^4.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==
+  dependencies:
+    JSONStream "^1.0.3"
+    browser-resolve "^2.0.0"
+    cached-path-relative "^1.0.2"
+    concat-stream "~1.6.0"
+    defined "^1.0.0"
+    detective "^5.2.0"
+    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-lookup-amd@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/module-lookup-amd/-/module-lookup-amd-7.0.1.tgz#d67c1a93f2ff8e38b8774b99a638e9a4395774b2"
@@ -19998,11 +21712,6 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
 nan@2.13.2:
   version "2.13.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
@@ -20387,11 +22096,21 @@ node-preload@^0.2.0:
   dependencies:
     process-on-spawn "^1.0.0"
 
-node-releases@^1.1.52, node-releases@^1.1.66:
+node-releases@^1.1.61:
+  version "1.1.77"
+  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"
+  integrity sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA==
+
 node-source-walk@^4.0.0, node-source-walk@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-4.2.0.tgz#c2efe731ea8ba9c03c562aa0a9d984e54f27bc2c"
@@ -20884,6 +22603,11 @@ on-finished@^2.3.0, on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
 once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -21183,11 +22907,6 @@ outpipe@^1.1.0:
   dependencies:
     shell-quote "^1.4.2"
 
-overlayscrollbars@^1.10.2:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.0.tgz#1edb436328133b94877b558f77966d5497ca36a7"
-  integrity sha512-p8oHrMeRAKxXDMPI/EBNITj/zTVHKNnAnM59Im+xnoZUlV07FyTg46wom2286jJlXGGfcPFG/ba5NUiCwWNd4w==
-
 overlayscrollbars@^1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a"
@@ -21270,7 +22989,7 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.1, p-limit@^3.0.2:
+p-limit@^3.0.1, p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
@@ -21298,6 +23017,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map-series@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
@@ -21593,7 +23319,7 @@ parse-url@^5.0.0:
     parse-path "^4.0.0"
     protocols "^1.4.0"
 
-parse5@6.0.1:
+parse5@6.0.1, parse5@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
@@ -21675,6 +23401,11 @@ path-browserify@0.0.1, path-browserify@~0.0.0:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
   integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
+path-browserify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -21895,6 +23626,16 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picocolors@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
@@ -21992,7 +23733,14 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-pkg-up@3.1.0, pkg-up@^3.1.0:
+pkg-dir@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
+  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
+  dependencies:
+    find-up "^5.0.0"
+
+pkg-up@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
@@ -22052,13 +23800,6 @@ po2json@0.4.5:
     gettext-parser "1.1.0"
     nomnom "1.8.1"
 
-polished@^3.4.4:
-  version "3.6.7"
-  resolved "https://registry.yarnpkg.com/polished/-/polished-3.6.7.tgz#44cbd0047f3187d83db0c479ef0c7d5583af5fb6"
-  integrity sha512-b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
-
 polished@^4.0.5:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.3.tgz#7a3abf2972364e7d97770b827eec9a9e64002cfc"
@@ -22088,12 +23829,12 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-flexbugs-fixes@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.1.0.tgz#e094a9df1783e2200b7b19f875dcad3b3aff8b20"
-  integrity sha512-jr1LHxQvStNNAHlgco6PzY308zvLklh7SJVYuWUwyUQncofaAlD2l+P/gxKHOdqWKe7xJSkVLFF/2Tp+JqMSZA==
+postcss-flexbugs-fixes@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz#9218a65249f30897deab1033aced8578562a6690"
+  integrity sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==
   dependencies:
-    postcss "^7.0.0"
+    postcss "^7.0.26"
 
 postcss-html@^0.36.0:
   version "0.36.0"
@@ -22109,23 +23850,16 @@ postcss-less@^3.1.4:
   dependencies:
     postcss "^7.0.14"
 
-postcss-load-config@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
-  dependencies:
-    cosmiconfig "^4.0.0"
-    import-cwd "^2.0.0"
-
-postcss-loader@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
+postcss-loader@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
+  integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==
   dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
+    cosmiconfig "^7.0.0"
+    klona "^2.0.4"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+    semver "^7.3.4"
 
 postcss-media-query-parser@^0.2.3:
   version "0.2.3"
@@ -22329,7 +24063,7 @@ postcss@^6.0.1, postcss@^6.0.19, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.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:
+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==
@@ -22338,6 +24072,14 @@ postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.2
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^7.0.36:
+  version "7.0.39"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
+  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
+  dependencies:
+    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"
@@ -22478,7 +24220,7 @@ prettier@^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.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
@@ -22657,6 +24399,14 @@ promisify-es6@^1.0.3:
   resolved "https://registry.yarnpkg.com/promisify-es6/-/promisify-es6-1.0.3.tgz#b012668c4df3c965ce13daac2b3a4d1726a96346"
   integrity sha512-N9iVG+CGJsI4b4ZGazjwLnxErD2d9Pe4DPvvXSxYA9tFNu8ymXME4Qs5HIQ0LMJpNM7zj+m0NlNnNeqFpKzqnA==
 
+prompts@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
+  integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
+  dependencies:
+    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"
@@ -22665,6 +24415,14 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
+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==
+  dependencies:
+    kleur "^3.0.3"
+    sisteransi "^1.0.5"
+
 prop-types-exact@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869"
@@ -22674,7 +24432,7 @@ prop-types-exact@^1.2.0:
     object.assign "^4.1.0"
     reflect.ownkeys "^0.2.0"
 
-prop-types@15.7.2, prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -22702,7 +24460,14 @@ property-information@^5.0.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"
+    xtend "^4.0.1"
+
+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==
+  dependencies:
+    xtend "^4.0.0"
 
 proto-list@~1.2.1:
   version "1.2.4"
@@ -23085,7 +24850,7 @@ qrcode-generator@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, qs@^6.6.0:
+qs@6.7.0, qs@^6.4.0, qs@^6.5.1, qs@^6.5.2:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
@@ -23253,7 +25018,7 @@ raw-body@~1.1.0:
     bytes "1"
     string_decoder "0.10"
 
-raw-loader@^4.0.1:
+raw-loader@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
   integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
@@ -23271,48 +25036,36 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-color@^2.17.0:
-  version "2.17.3"
-  resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.17.3.tgz#b8556d744f95193468c7061d2aa19180118d4a48"
-  integrity sha512-1dtO8LqAVotPIChlmo6kLtFS1FP89ll8/OiA8EcFRDR+ntcK+0ukJgByuIQHRtzvigf26dV5HklnxDIvhON9VQ==
-  dependencies:
-    "@icons/material" "^0.2.4"
-    lodash "^4.17.11"
-    material-colors "^1.2.1"
-    prop-types "^15.5.10"
-    reactcss "^1.2.0"
-    tinycolor2 "^1.4.1"
-
 react-colorful@^5.1.2:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.3.0.tgz#bcbae49c1affa9ab9a3c8063398c5948419296bd"
   integrity sha512-zWE5E88zmjPXFhv6mGnRZqKin9s5vip1O3IIGynY9EhZxN8MATUxZkT3e/9OwTEm4DjQBXc6PFWP6AetY+Px+A==
 
-react-dev-utils@^10.0.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz#f6de325ae25fa4d546d09df4bb1befdc6dd19c19"
-  integrity sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==
+react-dev-utils@^11.0.3:
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.4.tgz#a7ccb60257a1ca2e0efe7a83e38e6700d17aa37a"
+  integrity sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==
   dependencies:
-    "@babel/code-frame" "7.8.3"
+    "@babel/code-frame" "7.10.4"
     address "1.1.2"
-    browserslist "4.10.0"
+    browserslist "4.14.2"
     chalk "2.4.2"
-    cross-spawn "7.0.1"
+    cross-spawn "7.0.3"
     detect-port-alt "1.1.6"
     escape-string-regexp "2.0.0"
-    filesize "6.0.1"
+    filesize "6.1.0"
     find-up "4.1.0"
-    fork-ts-checker-webpack-plugin "3.1.1"
+    fork-ts-checker-webpack-plugin "4.1.6"
     global-modules "2.0.0"
-    globby "8.0.2"
+    globby "11.0.1"
     gzip-size "5.1.1"
-    immer "1.10.0"
-    inquirer "7.0.4"
+    immer "8.0.1"
     is-root "2.1.0"
-    loader-utils "1.2.3"
+    loader-utils "2.0.0"
     open "^7.0.2"
     pkg-up "3.1.0"
-    react-error-overlay "^6.0.7"
+    prompts "2.4.0"
+    react-error-overlay "^6.0.9"
     recursive-readdir "2.2.2"
     shell-quote "1.7.2"
     strip-ansi "6.0.0"
@@ -23358,31 +25111,10 @@ react-dnd@^3.0.2:
     prop-types "^15.5.10"
     shallowequal "^1.0.2"
 
-react-docgen-typescript-loader@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript-loader/-/react-docgen-typescript-loader-3.7.2.tgz#45cb2305652c0602767242a8700ad1ebd66bbbbd"
-  integrity sha512-fNzUayyUGzSyoOl7E89VaPKJk9dpvdSgyXg81cUkwy0u+NBvkzQG3FC5WBIlXda0k/iaxS+PWi+OC+tUiGxzPA==
-  dependencies:
-    "@webpack-contrib/schema-utils" "^1.0.0-beta.0"
-    loader-utils "^1.2.3"
-    react-docgen-typescript "^1.15.0"
-
-react-docgen-typescript-plugin@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-0.6.2.tgz#c83305206c61d5c7e004eaf2dc4661367ddc105d"
-  integrity sha512-Orw0WKdJGAg5eMZGbEMw/rKonoxbi8epU6RJWTW3ukWuTarxckFXTltGvm8XADAWlBHak30KD71XThtJruxfTg==
-  dependencies:
-    debug "^4.1.1"
-    endent "^2.0.1"
-    micromatch "^4.0.2"
-    react-docgen-typescript "^1.20.1"
-    react-docgen-typescript-loader "^3.7.2"
-    tslib "^2.0.0"
-
-react-docgen-typescript@^1.15.0, react-docgen-typescript@^1.20.1:
-  version "1.20.5"
-  resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-1.20.5.tgz#fb8d78a707243498436c2952bd3f6f488a68d4f3"
-  integrity sha512-AbLGMtn76bn7SYBJSSaKJrZ0lgNRRR3qL60PucM5M4v/AXyC8221cKBXW5Pyt9TfDRfe+LDnPNlg7TibxX0ovA==
+react-docgen-typescript@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-2.1.1.tgz#c9f9ccb1fa67e0f4caf3b12f2a07512a201c2dcf"
+  integrity sha512-XWe8bsYqVjxciKdpNoufaHiB7FgUHIOnVQgxUolRL3Zlof2zkdTzuQH6SU2n3Ek9kfy3O1c63ojMtNfpiuNeZQ==
 
 react-docgen@^5.0.0:
   version "5.1.0"
@@ -23408,12 +25140,12 @@ react-dom@^16.12.0:
     prop-types "^15.6.2"
     scheduler "^0.18.0"
 
-react-draggable@^4.0.3:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.2.0.tgz#40cc5209082ca7d613104bf6daf31372cc0e1114"
-  integrity sha512-5wFq//gEoeTYprnd4ze8GrFc+Rbnx+9RkOMR3vk4EbWxj02U6L6T3yrlKeiw4X5CtjD2ma2+b3WujghcXNRzkw==
+react-draggable@^4.4.3:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f"
+  integrity sha512-6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA==
   dependencies:
-    classnames "^2.2.5"
+    clsx "^1.1.1"
     prop-types "^15.6.0"
 
 react-easy-swipe@^0.0.21:
@@ -23423,48 +25155,49 @@ react-easy-swipe@^0.0.21:
   dependencies:
     prop-types "^15.5.8"
 
-react-error-overlay@^6.0.7:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz#474ed11d04fc6bda3af643447d85e9127ed6b5de"
-  integrity sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw==
+react-element-to-jsx-string@^14.3.2:
+  version "14.3.2"
+  resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.2.tgz#c0000ed54d1f8b4371731b669613f2d4e0f63d5c"
+  integrity sha512-WZbvG72cjLXAxV7VOuSzuHEaI3RHj10DZu8EcKQpkKcAj7+qAkG5XUeSdX5FXrA0vPrlx0QsnAzZEBJwzV0e+w==
+  dependencies:
+    "@base2/pretty-print-object" "1.0.0"
+    is-plain-object "3.0.1"
 
-react-fast-compare@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
-  integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
+react-error-overlay@^6.0.9:
+  version "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-helmet-async@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.0.2.tgz#bb55dd8268f7b15aac69c6b22e2f950abda8cc44"
-  integrity sha512-qzzchrM/ibHuPS/60ief8jaibPunuRdeta4iBDQV+ri2SFKwOV+X2NlEpvevZOauhmHrH/I6dI4E90EPVfJBBg==
-  dependencies:
-    "@babel/runtime" "7.3.4"
-    invariant "2.2.4"
-    prop-types "15.7.2"
-    react-fast-compare "2.0.4"
-    shallowequal "1.1.0"
+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==
 
-react-hotkeys@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-2.0.0.tgz#a7719c7340cbba888b0e9184f806a9ec0ac2c53f"
-  integrity sha512-3n3OU8vLX/pfcJrR3xJ1zlww6KS1kEJt0Whxc4FiGV+MJrQ1mYSYI3qS/11d2MJDFm8IhOXMTFQirfu6AVOF6Q==
+react-helmet-async@^1.0.7:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.1.2.tgz#653b7e6bbfdd239c5dcd6b8df2811c7a363b8334"
+  integrity sha512-LTTzDDkyIleT/JJ6T/uqx7Y8qi1EuPPSiJawQY/nHHz0h7SPDT6HxP1YDDQx/fzcVxCqpWEEMS3QdrSrNkJYhg==
   dependencies:
-    prop-types "^15.6.1"
+    "@babel/runtime" "^7.12.5"
+    invariant "^2.2.4"
+    prop-types "^15.7.2"
+    react-fast-compare "^3.2.0"
+    shallowequal "^1.1.0"
 
 react-idle-timer@^4.2.5:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/react-idle-timer/-/react-idle-timer-4.2.5.tgz#eb7d6e1b318f7755b5e0ee810254a8e95a2271b7"
   integrity sha512-8B/OwjG8E/DTx1fHYKTpZ4cnCbL9+LOc5I9t8SYe8tbEkP14KChiYg0xPIuyRpO33wUZHcgmQl93CVePaDhmRA==
 
-react-input-autosize@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2"
-  integrity sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==
+react-input-autosize@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85"
+  integrity sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==
   dependencies:
     prop-types "^15.5.8"
 
@@ -23476,21 +25209,21 @@ react-inspector@^2.3.0:
     babel-runtime "^6.26.0"
     is-dom "^1.0.9"
 
-react-inspector@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.0.tgz#45a325e15f33e595be5356ca2d3ceffb7d6b8c3a"
-  integrity sha512-JAwswiengIcxi4X/Ssb8nf6suOuQsyit8Fxo04+iPKTnPNY3XIOuagjMZSzpJDDKkYcc/ARlySOYZZv626WUvA==
+react-inspector@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.1.tgz#58476c78fde05d5055646ed8ec02030af42953c8"
+  integrity sha512-GURDaYzoLbW8pMGXwYPDBIv6nqei4kK7LPRZ9q9HCZF54wqXz/dnylBp/kfE9XmekBhHvLDdcYeyIwSrvtOiWg==
   dependencies:
     "@babel/runtime" "^7.0.0"
     is-dom "^1.0.0"
     prop-types "^15.0.0"
 
-react-is@^16.10.2, react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
+react-is@^16.10.2, react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^17.0.1:
+react-is@^17.0.1, react-is@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
@@ -23580,10 +25313,10 @@ react-router@5.1.2:
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
 
-react-select@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.8.tgz#06ff764e29db843bcec439ef13e196865242e0c1"
-  integrity sha512-v9LpOhckLlRmXN5A6/mGGEft4FMrfaBFTGAnuPHcUgVId7Je42kTq9y0Z+Ye5z8/j0XDT3zUqza8gaRaI1PZIg==
+react-select@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.2.0.tgz#de9284700196f5f9b5277c5d850a9ce85f5c72fe"
+  integrity sha512-B/q3TnCZXEKItO0fFN/I0tWOX3WJvi/X2wtdffmwSQVRwg5BpValScTO1vdic9AxlUgmeSzib2hAZAwIUQUZGQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/cache" "^10.0.9"
@@ -23591,8 +25324,8 @@ react-select@^3.0.8:
     "@emotion/css" "^10.0.9"
     memoize-one "^5.0.0"
     prop-types "^15.6.0"
-    react-input-autosize "^2.2.2"
-    react-transition-group "^2.2.1"
+    react-input-autosize "^3.0.0"
+    react-transition-group "^4.3.0"
 
 react-simple-file-input@^2.0.0:
   version "2.0.1"
@@ -23601,17 +25334,17 @@ react-simple-file-input@^2.0.0:
   dependencies:
     prop-types "^15.5.7"
 
-react-sizeme@^2.6.7:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
-  integrity sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==
+react-sizeme@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-3.0.2.tgz#4a2f167905ba8f8b8d932a9e35164e459f9020e4"
+  integrity sha512-xOIAOqqSSmKlKFJLO3inBQBdymzDuXx4iuwkNcJmC96jeiOg5ojByvL+g3MW9LPEsojLbC6pf68zOfobK8IPlw==
   dependencies:
-    element-resize-detector "^1.2.1"
+    element-resize-detector "^1.2.2"
     invariant "^2.2.4"
     shallowequal "^1.1.0"
-    throttle-debounce "^2.1.0"
+    throttle-debounce "^3.0.1"
 
-react-syntax-highlighter@^13.5.0, react-syntax-highlighter@^13.5.3:
+react-syntax-highlighter@^13.5.3:
   version "13.5.3"
   resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6"
   integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg==
@@ -23632,15 +25365,6 @@ react-test-renderer@^16.0.0-0:
     react-is "^16.8.6"
     scheduler "^0.18.0"
 
-react-textarea-autosize@^8.1.1:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.0.tgz#e6e2fd186d9f61bb80ac6e2dcb4c55504f93c2fa"
-  integrity sha512-3GLWFAan2pbwBeoeNDoqGmSbrShORtgWfaWX0RJDivsUrpShh01saRM5RU/i4Zmf+whpBVEY5cA90Eq8Ub1N3w==
-  dependencies:
-    "@babel/runtime" "^7.10.2"
-    use-composed-ref "^1.0.0"
-    use-latest "^1.0.0"
-
 react-textarea-autosize@^8.3.0:
   version "8.3.3"
   resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8"
@@ -23676,15 +25400,15 @@ react-transition-group@^1.2.1:
     prop-types "^15.5.6"
     warning "^3.0.0"
 
-react-transition-group@^2.2.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
-  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
+react-transition-group@^4.3.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==
   dependencies:
-    dom-helpers "^3.4.0"
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
 
 react-transition-group@^4.4.0:
   version "4.4.1"
@@ -23697,21 +25421,14 @@ react-transition-group@^4.4.0:
     prop-types "^15.6.2"
 
 react@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
-  integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
+  version "16.14.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
+  integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
-reactcss@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd"
-  integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==
-  dependencies:
-    lodash "^4.0.1"
-
 read-all-stream@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
@@ -24028,7 +25745,7 @@ regenerate@^1.2.1, regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@0.13.3, regenerator-runtime@^0.11.0, regenerator-runtime@^0.12.0, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@0.13.3, regenerator-runtime@^0.11.0, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
   integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
@@ -24195,6 +25912,58 @@ release-zalgo@^1.0.0:
   dependencies:
     es6-error "^4.0.1"
 
+remark-external-links@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/remark-external-links/-/remark-external-links-8.0.0.tgz#308de69482958b5d1cd3692bc9b725ce0240f345"
+  integrity sha512-5vPSX0kHoSsqtdftSHhIYofVINC8qmp0nctkeU9YoJwV3YfiBRiI6cbFRJ0oI/1F9xS+bopXG0m2KS8VFscuKA==
+  dependencies:
+    extend "^3.0.0"
+    is-absolute-url "^3.0.0"
+    mdast-util-definitions "^4.0.0"
+    space-separated-tokens "^1.0.0"
+    unist-util-visit "^2.0.0"
+
+remark-footnotes@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
+  integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
+
+remark-mdx@1.6.22:
+  version "1.6.22"
+  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd"
+  integrity sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==
+  dependencies:
+    "@babel/core" "7.12.9"
+    "@babel/helper-plugin-utils" "7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "7.12.1"
+    "@babel/plugin-syntax-jsx" "7.12.1"
+    "@mdx-js/util" "1.6.22"
+    is-alphabetical "1.0.4"
+    remark-parse "8.0.3"
+    unified "9.2.0"
+
+remark-parse@8.0.3:
+  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==
+  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-parse@^8.0.0:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.2.tgz#5999bc0b9c2e3edc038800a64ff103d0890b318b"
@@ -24217,6 +25986,22 @@ remark-parse@^8.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"
+  integrity sha512-oGCxDF9deA8phWvxFuyr3oSJsdyUAxMFbA0mZ7Y1Sas+emILtO+e5WutF9564gDsEN4IXaQXm5pFo6MLH+YmwQ==
+  dependencies:
+    github-slugger "^1.0.0"
+    mdast-util-to-string "^1.0.0"
+    unist-util-visit "^2.0.0"
+
+remark-squeeze-paragraphs@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead"
+  integrity sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==
+  dependencies:
+    mdast-squeeze-paragraphs "^4.0.0"
+
 remark-stringify@^8.0.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.0.tgz#1e555f4402e445c364fb23d12fc5f5e0337ec8b7"
@@ -24346,13 +26131,6 @@ request-promise-core@1.1.1:
   dependencies:
     lodash "^4.13.1"
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
 request-promise-native@^1.0.3:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
@@ -24362,15 +26140,6 @@ request-promise-native@^1.0.3:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request-promise-native@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
 request@^2.79.0, request@^2.83.0, request@^2.85.0, request@^2.88.2, request@~2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -24402,7 +26171,7 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.1, require-from-string@^2.0.2:
+require-from-string@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
@@ -24478,11 +26247,6 @@ resolve-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
   integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
 
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -24547,6 +26311,14 @@ resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0,
     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:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    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"
@@ -24555,14 +26327,6 @@ resolve@^1.15.1:
     is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
-resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.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"
@@ -24601,14 +26365,6 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 resumer@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
@@ -24736,6 +26492,13 @@ ripple-lib@1.8.2:
     ripple-lib-transactionparser "0.8.2"
     ws "^7.2.0"
 
+rlp-browser@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rlp-browser/-/rlp-browser-1.0.1.tgz#d1ea37f289359200d33dfa006d46008a288761eb"
+  integrity sha512-JU+9ntlfyKanOOPwtNuMZBmCQ/fWVoryfa7ZSYDTUKAa1zk4v2smvM0WV8BsskJuqn/DdxpO7HO2vEikMvmhOA==
+  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"
@@ -24865,7 +26628,7 @@ rxjs@6:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0, rxjs@^6.5.2, rxjs@^6.5.3:
+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==
@@ -25009,6 +26772,15 @@ scheduler@^0.18.0:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+schema-utils@2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
+  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
+  dependencies:
+    "@types/json-schema" "^7.0.4"
+    ajv "^6.12.2"
+    ajv-keywords "^3.4.1"
+
 schema-utils@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
@@ -25026,7 +26798,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
+schema-utils@^2.6.5, schema-utils@^2.7.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
   integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
@@ -25081,6 +26853,15 @@ scss-parser@^1.0.4:
   dependencies:
     invariant "2.2.4"
 
+secp256k1@4.0.2, 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==
+  dependencies:
+    elliptic "^6.5.2"
+    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:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.8.0.tgz#28f59f4b01dbee9575f56a47034b7d2e3b3b352d"
@@ -25095,15 +26876,6 @@ secp256k1@^3.0.1, secp256k1@^3.5.2, secp256k1@^3.6.1, secp256k1@^3.6.2:
     nan "^2.14.0"
     safe-buffer "^5.1.2"
 
-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==
-  dependencies:
-    elliptic "^6.5.2"
-    node-addon-api "^2.0.0"
-    node-gyp-build "^4.2.0"
-
 seedrandom@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.1.tgz#eb3dde015bcf55df05a233514e5df44ef9dce083"
@@ -25152,7 +26924,7 @@ semver-greatest-satisfied-range@^1.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.2.0, semver@^6.3.0:
+semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -25207,6 +26979,13 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-favicon@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.5.0.tgz#935d240cdfe0f5805307fdfe967d88942a2cbcf0"
@@ -25350,11 +27129,18 @@ shallow-copy@~0.0.1:
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
   integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
-shallowequal@1.1.0, shallowequal@^1.0.2, shallowequal@^1.1.0:
+shallowequal@^1.0.2, shallowequal@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
 
+shasum-object@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shasum-object/-/shasum-object-1.0.0.tgz#0b7b74ff5b66ecf9035475522fa05090ac47e29e"
+  integrity sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==
+  dependencies:
+    fast-safe-stringify "^2.0.7"
+
 shasum@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
@@ -25401,7 +27187,7 @@ shelljs@^0.7.5:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-shelljs@^0.8.1, shelljs@^0.8.4:
+shelljs@^0.8.1:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
   integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
@@ -25783,6 +27569,14 @@ source-map-support@^0.5.11, source-map-support@^0.5.16, source-map-support@^0.5.
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@~0.5.20:
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -26001,7 +27795,7 @@ static-module@^3.0.2:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stealthy-require@^1.1.0, stealthy-require@^1.1.1:
+stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
@@ -26011,16 +27805,22 @@ store2@^2.12.0:
   resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf"
   integrity sha512-7t+/wpKLanLzSnQPX8WAcuLCCeuSHoWdQuh9SB3xD0kNOM38DNf+0Oa+wmvxmYueRzkmh6IcdKFtvTa+ecgPDw==
 
-store2@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/store2/-/store2-2.7.1.tgz#22070b7dc04748a792fc6912a58ab99d3a21d788"
-  integrity sha512-zzzP5ZY6QWumnAFV6kBRbS44pUMcpZBNER5DWUe1HETlaKXqLcCQxbNu6IHaKr1pUsjuhUGBdOy8sWKmMkL6pQ==
-
 store@^2.0.12:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593"
   integrity sha1-jFNOKguDH3K3X8XxEZhXxE711ZM=
 
+storybook-addon-outline@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/storybook-addon-outline/-/storybook-addon-outline-1.4.1.tgz#0a1b262b9c65df43fc63308a1fdbd4283c3d9458"
+  integrity sha512-Qvv9X86CoONbi+kYY78zQcTGmCgFaewYnOVR6WL7aOFJoW7TrLiIc/O4hH5X9PsEPZFqjfXEPUPENWVUQim6yw==
+  dependencies:
+    "@storybook/addons" "^6.3.0"
+    "@storybook/api" "^6.3.0"
+    "@storybook/components" "^6.3.0"
+    "@storybook/core-events" "^6.3.0"
+    ts-dedent "^2.1.1"
+
 stream-browserify@^2.0.0, stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -26455,7 +28255,7 @@ style-loader@^0.21.0:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
 
-style-loader@^1.2.1:
+style-loader@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.3.0.tgz#828b4a3b3b7e7aa5847ce7bae9e874512114249e"
   integrity sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==
@@ -26468,6 +28268,13 @@ style-search@^0.1.0:
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
   integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
 
+style-to-object@0.3.0, style-to-object@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
+  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
+  dependencies:
+    inline-style-parser "0.1.1"
+
 stylelint@^13.6.1:
   version "13.6.1"
   resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.6.1.tgz#cc1d76338116d55e8ff2be94c4a4386c1239b878"
@@ -26564,7 +28371,7 @@ superagent-proxy@^2.0.0, superagent-proxy@^3.0.0:
     debug "^4.3.2"
     proxy-agent "^5.0.0"
 
-superagent@^3.8.1:
+superagent@^3.8.1, superagent@^3.8.3:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128"
   integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==
@@ -26843,20 +28650,6 @@ tdigest@^0.1.1:
   dependencies:
     bintrees "1.0.1"
 
-telejson@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.1.0.tgz#cc04e4c2a355f9eb6af557e37acd6449feb1d146"
-  integrity sha512-Yy0N2OV0mosmr1SCZEm3Ezhu/oi5Dbao5RqauZu4+VI5I/XtVBHXajRk0txuqbFYtKdzzWGDZFGSif9ovVLjEA==
-  dependencies:
-    "@types/is-function" "^1.0.0"
-    global "^4.4.0"
-    is-function "^1.0.2"
-    is-regex "^1.1.1"
-    is-symbol "^1.0.3"
-    isobject "^4.0.0"
-    lodash "^4.17.20"
-    memoizerific "^1.11.3"
-
 telejson@^5.3.2:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.3.3.tgz#fa8ca84543e336576d8734123876a9f02bf41d2e"
@@ -26913,22 +28706,22 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz#91e6d39571460ed240c0cf69d295bcf30ebf98cb"
-  integrity sha512-cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA==
+terser-webpack-plugin@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
+  integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
   dependencies:
     cacache "^15.0.5"
     find-cache-dir "^3.3.1"
-    jest-worker "^26.2.1"
+    jest-worker "^26.5.0"
     p-limit "^3.0.2"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
+    schema-utils "^3.0.0"
+    serialize-javascript "^5.0.1"
     source-map "^0.6.1"
-    terser "^4.8.0"
+    terser "^5.3.4"
     webpack-sources "^1.4.3"
 
-terser@^4.1.2, terser@^4.6.3, terser@^4.8.0:
+terser@^4.1.2, terser@^4.6.3:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -26937,6 +28730,15 @@ terser@^4.1.2, terser@^4.6.3, terser@^4.8.0:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^5.3.4:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351"
+  integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==
+  dependencies:
+    commander "^2.20.0"
+    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"
@@ -26975,10 +28777,10 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-throttle-debounce@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5"
-  integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg==
+throttle-debounce@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb"
+  integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==
 
 through2-filter@^2.0.0:
   version "2.0.0"
@@ -27124,11 +28926,6 @@ tiny-worker@^2.3.0:
   dependencies:
     esm "^3.2.25"
 
-tinycolor2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
-  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
-
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
@@ -27232,7 +29029,7 @@ to-through@^2.0.0:
   dependencies:
     through2 "^2.0.3"
 
-toggle-selection@^1.0.3:
+toggle-selection@^1.0.3, 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=
@@ -27367,6 +29164,11 @@ ts-dedent@^2.0.0:
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.0.0.tgz#47c5eb23d9096f3237cc413bc82d387d36dbe690"
   integrity sha512-DfxKjSFQfw9+uf7N9Cy8Ebx9fv5fquK4hZ6SD3Rzr+1jKP6AVA6H8+B5457ZpUs0JKsGpGqIevbpZ9DMQJDp1A==
 
+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==
+
 ts-essentials@^2.0.3:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
@@ -27397,6 +29199,11 @@ tslib@^2.0.0, tslib@^2.0.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
   integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
 
+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==
+
 tsscmp@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
@@ -27645,10 +29452,10 @@ undertaker@^1.2.1:
     object.reduce "^1.0.0"
     undertaker-registry "^1.0.0"
 
-unfetch@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
-  integrity sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg==
+unfetch@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
+  integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
 
 unherit@^1.0.4:
   version "1.1.2"
@@ -27686,6 +29493,18 @@ 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:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
+  integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==
+  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"
+
 unified@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-9.0.0.tgz#12b099f97ee8b36792dbad13d278ee2f696eed1d"
@@ -27747,6 +29566,11 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+unist-builder@2.0.3, unist-builder@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
+  integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
+
 unist-util-find-all-after@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz#95cc62f48812d879b4685a0512bf1b838da50e9a"
@@ -27754,11 +29578,21 @@ unist-util-find-all-after@^3.0.1:
   dependencies:
     unist-util-is "^4.0.0"
 
+unist-util-generated@^1.0.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
+  integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
+
 unist-util-is@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.2.tgz#c7d1341188aa9ce5b3cff538958de9895f14a5de"
   integrity sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==
 
+unist-util-position@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
+  integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
+
 unist-util-remove-position@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc"
@@ -27766,6 +29600,13 @@ unist-util-remove-position@^2.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
+unist-util-remove@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588"
+  integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==
+  dependencies:
+    unist-util-is "^4.0.0"
+
 unist-util-stringify-position@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz#de2a2bc8d3febfa606652673a91455b6a36fb9f3"
@@ -27781,7 +29622,7 @@ unist-util-visit-parents@^3.0.0:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
 
-unist-util-visit@^2.0.0:
+unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
   integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
@@ -27904,7 +29745,7 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-loader@^4.0.0:
+url-loader@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2"
   integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==
@@ -28058,7 +29899,7 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-util@^0.12.3:
+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==
@@ -28080,6 +29921,11 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
+uuid-browser@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uuid-browser/-/uuid-browser-3.1.0.tgz#0f05a40aef74f9e5951e20efbf44b11871e56410"
+  integrity sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=
+
 uuid@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.1.tgz#c2a30dedb3e535d72ccf82e343941a50ba8533ac"
@@ -28095,12 +29941,12 @@ uuid@3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-uuid@^3.1.0, uuid@^3.2.1, uuid@^3.2.2, uuid@^3.3.2, uuid@^3.3.3:
+uuid@^3.2.1, uuid@^3.2.2, uuid@^3.3.2, uuid@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866"
   integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==
 
-uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2:
+uuid@^8.3.0, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -28197,6 +30043,11 @@ vfile-location@^3.0.0:
   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:
+  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==
+
 vfile-message@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz#951881861c22fc1eb39f873c0b93e336a64e8f6d"
@@ -28365,18 +30216,18 @@ warning@^4.0.2, warning@^4.0.3:
   dependencies:
     loose-envify "^1.0.0"
 
-watchify@^3.11.1:
-  version "3.11.1"
-  resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.1.tgz#8e4665871fff1ef64c0430d1a2c9d084d9721881"
-  integrity sha512-WwnUClyFNRMB2NIiHgJU9RQPQNqVeFk7OmZaWf5dC5EnNa0Mgr7imBydbaJ7tGTuPM2hz1Cb4uiBvK9NVxMfog==
+watchify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/watchify/-/watchify-4.0.0.tgz#53b002d51e7b0eb640b851bb4de517a689973392"
+  integrity sha512-2Z04dxwoOeNxa11qzWumBTgSAohTC0+ScuY7XMenPnH+W2lhTcpEOJP4g2EIG/SWeLadPk47x++Yh+8BqPM/lA==
   dependencies:
-    anymatch "^2.0.0"
-    browserify "^16.1.0"
-    chokidar "^2.1.1"
+    anymatch "^3.1.0"
+    browserify "^17.0.0"
+    chokidar "^3.4.0"
     defined "^1.0.0"
     outpipe "^1.1.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
+    through2 "^4.0.2"
+    xtend "^4.0.2"
 
 watchpack-chokidar2@^2.0.1:
   version "2.0.1"
@@ -28412,6 +30263,11 @@ web-encoding@^1.0.2, web-encoding@^1.0.6:
   optionalDependencies:
     "@zxing/text-encoding" "0.9.0"
 
+web-namespaces@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
+  integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==
+
 web3-bzz@1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.11.tgz#41bc19a77444bd5365744596d778b811880f707f"
@@ -28762,13 +30618,14 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-dev-middleware@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
-  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
+webpack-dev-middleware@^3.7.3:
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5"
+  integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==
   dependencies:
     memory-fs "^0.4.1"
-    mime "^2.4.2"
+    mime "^2.4.4"
+    mkdirp "^0.5.1"
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
@@ -28787,16 +30644,6 @@ webpack-hot-middleware@^2.25.0:
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
-webpack-log@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
-  integrity sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==
-  dependencies:
-    chalk "^2.1.0"
-    log-symbols "^2.1.0"
-    loglevelnext "^1.0.1"
-    uuid "^3.1.0"
-
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
@@ -28820,7 +30667,36 @@ webpack-virtual-modules@^0.2.2:
   dependencies:
     debug "^3.0.0"
 
-webpack@^4.41.6, webpack@^4.44.2:
+webpack@4:
+  version "4.46.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
+  integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
+  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.5.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"
+
+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==
@@ -29117,7 +30993,7 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@7.1.0, ws@7.4.6, ws@^1.1.0, ws@^3.0.0, ws@^5.1.1, ws@^7, ws@^7.2.0, ws@^7.4.0, ws@^7.4.4, ws@^7.4.6, ws@~7.4.2:
+ws@7.1.0, ws@7.4.6, ws@^1.1.0, ws@^3.0.0, ws@^5.1.1, ws@^7, ws@^7.2.0, ws@^7.4.0, ws@^7.4.6, ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
@@ -29478,3 +31354,8 @@ zcash-bitcore-lib@~0.13.20-rc3:
     elliptic "=3.0.3"
     inherits "=2.0.1"
     lodash "=3.10.1"
+
+zwitch@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
+  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==