From 553b12b4c6f7b466bfe1e7f9ea493b9791561305 Mon Sep 17 00:00:00 2001
From: Andrii Ivaniv <unixvb@users.noreply.github.com>
Date: Mon, 9 Jan 2023 15:22:52 +0200
Subject: [PATCH] 1.16.0 (#842)

* taquito version bump (#829)

* 15.5.5

* TW-391 Changed Skip Ad button on advertisement (#834)

* TW-320: Manifest v3 JSON (#807)

* TW-317: Abandon XMLHttpRequest in BG. Applied axios fetch adapter.

* TW-317: Abandon XMLHttpRequest in BG. Fix BG test

* TW-312: Eliminate 'window' reliance in BG script. Resolving 'regenerator-runtime' package version.

* TW-312: Eliminate 'window' in BG. Refactored 'is-lock-up' setting

* TW-312: Eliminate 'window' in BG. Refactored 'lock-up' feature for MV3

* TW-312: Eliminate 'window' in BG. Refactored 'locale' storing

* TW-312: Eliminate 'window' in BG. Refactored 'Vault.spawn'

* TW-312: Eliminate 'window' in BG. Refactored 'vault.ts>createLedgerSigner()'

* TW-312: Eliminate 'window' in BG. Eliminated LedgerSigner creation to foreground

* Merge branch 'development' into TW-312-eliminate-window-in-bg

* TW-312: Eliminate 'window' in BG. Refactor

* TW-320: Manifest v3 JSON. Edited manifest.json

* TW-312: Eliminate 'window' in BG. Fix for lost 'no-use-before-define' rule follow

* TW-312: Eliminate 'window' in BG. Fix: removed Intercom server instance from FG

* TW-312: Eliminate 'window' in BG. + IDs to TempleLedgerSignerProxy instances

* TW-312: Eliminate 'window' in BG. Refactor

* TW-317: Abandon XMLHttpRequest in BG. Merged from 'development' branch

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix for ledger-bridge's <iframe> interraction

* WIP: TW-312: Eliminate 'window' in BG. Ledger rework. Ledger bridge written locally

* TW-312: Eliminate 'window' in BG. Ledger rework. Ledger bridge written locally

* WIP: TW-317: Abandon XMLHttpRequest in BG. Updated '@taquito/*' to v14.1.0

* TW-317: Abandon XMLHttpRequest in BG. ++ '@taquito/*'

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix. LedgerHQ updated

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix. LedgerHQ updated

* WIP: TW-320: Manifest v3 JSON. WebPack rework

* WIP: TW-320: Manifest v3 JSON. WebPack rework

* TW-320: Manifest v3 JSON. WebPack rework. Linted

* TW-320: Manifest v3 JSON. WebPack rework. Refactor

* TW-320: Manifest v3 JSON. WebPack rework. Clean-up fix.

* TW-320: Manifest v3 JSON. WebPack rework. TypeScript

* TW-320: Manifest v3 JSON. WebPack rework. package.json:version > manifest.json:version

* TW-319: Manifest v3. Keep v2 for Firefox

* TW-312: Eliminate 'window' in BG. Ledger rework. Dynamic import for ledger-bridge iframe module

* WIP: TW-310: Manifest v3. Fix disconnecting Intercom port

* TW-312: Eliminate 'window' in BG. Ledger rework. Refactor

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix for 'ledger-live in popup window' case

* TW-312: Eliminate 'window' in BG. Ledger rework. Refactor

* TW-312: Eliminate 'window' in BG. Removed console.log

* TW-320: Manifest v3 JSON. WebPack rework. + Definition for 'process.env.MANIFEST_VERSION'

* TW-320: Manifest v3 JSON. WebPack rework. Fix for BG script path in MV2

* TW-320: Manifest v3 JSON. WebPack rework. Fix for BG script chunks

* TW-310: Manifest v3. Fix disconnecting Intercom port

* WIP: TW-310: Manifest v3. Prolong SW lifetime

* TW-310: Manifest v3. Prolong SW lifetime. + scripts/keepBackgroundWorkerAlive.js

* TW-310: Manifest v3. Prolong SW lifetime. Refactor

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix for WebAuthn transport on MV2

* TW-320: Manifest v3 JSON. WebPack rework. + 'safari' vendor

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix for Firefox multiple tabs on WebAuthn

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix for duplicate 'ledgerlive://bridge' tabs opening

* Merge branch 'TW-312-eliminate-window-in-bg' into TW-320-manifest-v3

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix for recurring Ledger Live bridge open fail

* TW-312: Eliminate 'window' in BG. Ledger rework. Fix for recurring Ledger Live bridge open fail

* TW-312: Eliminate 'window' in BG. Ledger rework. ++ ledger-live.utils

* TW-320: Manifest v3 JSON. Refactor

* TW-320: Manifest v3 JSON. Fix dev live reload

* TW-320: Manifest v3 JSON. WebPack rework. Refactor

* TW-320: Manifest v3 JSON. WebPack rework. Fix dev pages reloader

* TW-320: Manifest v3 JSON. WebPack rework. + Custom dev pages reloader

* TW-320: Manifest v3 JSON. WebPack rework. Exports in ES6

* TW-320: Manifest v3 JSON. WebPack rework. Refactor

* TW-320: Manifest v3 JSON. Keeping BG worker alive from extension pages too

* TW-320: Manifest v3 JSON. BG, Vault. + Saving session (password hash)

* TW-320: Manifest v3 JSON. Fix for 'lock-enabled' feature

* TW-320: Manifest v3 JSON. Refactor lib/temple/back/vault (#827)

* TW-320: Manifest v3 JSON. Not keeping BG worker alive (#831)

* TW-320: Manifest v3 JSON. Refactor

* TW-320: Manifest v3 JSON. + Reset of 'browser.sstorage.session'

* TW-320: Manifest v3 JSON. Fix for WASM file loading in BG worker

* TW-320: Manifest v3 JSON. Refactor

* TW-427: Data URI for assets' icons (#839)

* TW-427: Data URI for assets' icons. Support at add asset

* TW-427: Data URI for assets' icons. Support at displaying icons

* TW-427: Data URI for assets' icons. + Fix for decimals display in AssetInfo component

* TW-392 Improved search assets (#835)

* TW-392 Improved search assets

* TW-392 Deleted console.logs

* TW-392 Deleted console.logs

* TW-392 Filtered assets harder

* TW-382: Utorg buy. Rate & min-max correction (#823)

* TW-382: Utorg buy. Rate & min-max correction

* TW-382: Utorg buy. Rate & min-max correction. Made Currency.network optional

* TW-382: Utorg buy. Rate & min-max correction. + 'app/templates/TopUpInput'

* TW-382: Utorg buy. Rate & min-max correction. Rate loaded for no less then minAmount

* TW-382: Utorg buy. Rate & min-max correction. Fix Alice-Bob top-up rate value

* TW-382: Utorg buy. Rate & min-max correction. Refactor

* TW406+407: [e2e] Setup pupeeteer + 'Import existing wallet' test (#822)

* basicTest+pupeeteer

* link test id fixed

* duplicate page fix

* envs setup + import existing wallet test

* envs setup + import existing wallet test

* Merge branch 'development' into e2e-setup

* [e2e] Setup. Refactor. '/extension-e2e' -> '/e2e' (#832)

* [e2e] Setup. Refactor. Fix for secrets setup

* TW406+407: [e2e] Setup. + Job to pipeline (#838)

* [e2e] Setup. + Job to pipeline

* [e2e] Setup. Pipeline. Run with Xvfb

* [e2e] Setup. Pipeline. Run with Xvfb. Secrets mock

* [e2e] Setup. Pipeline. Run with 'mujo-code/puppeteer-headful'

* [e2e] Setup. Pipeline. Gave up 'mujo-code/puppeteer-headful'

* [e2e] Setup. Pipeline. Secrets mocks clean-up

* TW-406: [e2e] Setup. GitHub workflow. Fix unit tests

* TW-406: [e2e] Setup. Throwing on missing secrets

* TestIDProps is extended

Co-authored-by: Andrii Ivaniv <unixvb@gmail.com>
Co-authored-by: alex-seleznov <alex.seleznov@gmail.com>
Co-authored-by: Alex <alexseleznov@madfish.solutions>

* TW-438: Issue #774. Confirm window not showing in dApps (#840)

* TW-438: Issue #774. Confirm window not showing in dApps

* TW-438: Issue #774. Confirm window not showing in dApps. Refactor

* 1.16.0

* TW-439: Fix Plenty images (#841)

* TW-439: Fix Plenty images. Trying all sizes now

* TW-439: Fix Plenty images. Fix icons in 'select asset' field on 'Send page'

Co-authored-by: Dmytro Herko <61412282+herkoss@users.noreply.github.com>
Co-authored-by: Alex <alexseleznov@madfish.solutions>
Co-authored-by: Vlad <95026747+NovakVlad2424@users.noreply.github.com>
Co-authored-by: alex-seleznov <alex.seleznov@gmail.com>
---
 .env                                          |    7 +-
 .eslintrc                                     |   13 +-
 .../workflows/code-quality-check/action.yml   |    4 +-
 .github/workflows/code-quality.yml            |   11 +-
 .github/workflows/e2e/action.yml              |   40 +
 .gitignore                                    |    5 +-
 e2e/.env.dist                                 |    3 +
 e2e/cucumber.json                             |    7 +
 e2e/package.json                              |   18 +
 e2e/src/classes/browser-context.class.ts      |   18 +
 e2e/src/classes/page.class.ts                 |    3 +
 .../features/import-existing-wallet.feature   |   19 +
 e2e/src/hooks/after-all.hook.ts               |    7 +
 e2e/src/hooks/before-all.hook.ts              |   15 +
 e2e/src/hooks/before.hook.ts                  |    8 +
 e2e/src/page-objects/index.ts                 |   11 +
 e2e/src/page-objects/pages/header.page.ts     |   13 +
 .../pages/importing-existing-wallet.page.ts   |   16 +
 .../pages/setWalletPassword.page.ts           |   19 +
 e2e/src/page-objects/pages/welcome.page.ts    |   13 +
 e2e/src/step-definitions/common.steps.ts      |   27 +
 e2e/src/utils/browser-context.utils.ts        |   10 +
 e2e/src/utils/browser.utils.ts                |   10 +
 e2e/src/utils/env.utils.ts                    |    5 +
 e2e/src/utils/input.utils.ts                  |   16 +
 e2e/src/utils/search.utils.ts                 |   46 +
 e2e/src/utils/shared-steps.utils.ts           |   14 +
 e2e/tsconfig.json                             |   12 +
 e2e/yarn.lock                                 | 1278 ++++++++++++++
 jest.config.ts                                |    4 +-
 package.json                                  |   46 +-
 public/_locales/en/messages.json              |    3 +
 public/manifest.json                          |   81 -
 public/misc/baker.svg                         |    4 -
 .../misc/exchangers-logos/quipuswap-logo.png  |  Bin 1897 -> 0 bytes
 src/app/App.tsx                               |    3 +
 src/app/PageRouter.tsx                        |    2 +-
 src/app/atoms/Button.tsx                      |    5 +-
 src/app/atoms/Checkbox.tsx                    |   13 +-
 src/app/atoms/FormCheckbox.tsx                |   19 +-
 src/app/atoms/FormField.tsx                   |    5 +-
 src/app/atoms/SeedPhraseInput.tsx             |    7 +-
 src/app/atoms/SeedWordInput.tsx               |    7 +-
 src/app/pages/AddAsset.tsx                    |   28 +-
 .../StaticCurrencyImage.tsx                   |   34 -
 .../components/TopUpInput/TopUpInput.props.ts |   21 -
 .../TopUpInputHeader/TopUpInputHeader.tsx     |  213 ---
 src/app/pages/Buy/Crypto/Exolix/config.ts     |   14 +-
 .../Buy/Crypto/Exolix/exolix.interface.ts     |   13 +-
 .../pages/Buy/Crypto/Exolix/exolix.util.ts    |   26 +-
 .../Buy/Crypto/Exolix/steps/InitialStep.tsx   |   30 +-
 .../Crypto/Exolix/steps/WarningComponent.tsx  |    4 +-
 .../Buy/Debit/AliceBob/AliceBobTopUp.tsx      |   19 +-
 src/app/pages/Buy/Debit/Utorg/Utorg.tsx       |   75 +-
 .../CurrenciesMenu/CurrenciesMenu.tsx         |   70 -
 .../CurrencyOption/CurrencyOption.tsx         |   37 -
 .../StaticCurrencyImage.tsx                   |   40 -
 .../components/TopUpInput/TopUpInput.props.ts |   22 -
 .../components/TopUpInput/TopUpInput.tsx      |   76 -
 src/app/pages/Buy/Debit/Utorg/config.ts       |    4 -
 .../Debit/Utorg/hooks/useDisabledProceed.ts   |   15 +-
 .../Buy/Debit/Utorg/hooks/useExchangeRate.ts  |   26 +-
 .../Utorg/hooks/useFilteredCurrencies.hook.ts |   31 -
 .../Buy/Debit/Utorg/hooks/useOutputAmount.ts  |    7 +-
 .../Utorg/hooks/useUpdatedExchangeInfo.ts     |   32 +-
 src/app/pages/Buy/Debit/Utorg/utils.ts        |    6 +
 src/app/pages/NewWallet/CreateWallet.tsx      |    2 +-
 src/app/pages/NewWallet/ImportWallet.tsx      |    4 +-
 .../ImportFromSeedPhrase.test-ids.ts          |    4 +
 .../ImportFromSeedPhrase.tsx                  |    8 +-
 .../SetWalletPassword.test-ids.ts             |    7 +
 .../SetWalletPassword.tsx                     |   22 +-
 .../pages/Onboarding/pages/AttentionPage.tsx  |    8 +-
 src/app/pages/Welcome/Welcome.test-ids.ts     |    4 +
 src/app/pages/{ => Welcome}/Welcome.tsx       |   14 +-
 .../Debit/AliceBob/steps/InitialStep.tsx      |   11 +-
 src/app/templates/AssetIcon.tsx               |   90 +-
 src/app/templates/AssetInfo.tsx               |    2 +-
 src/app/templates/AssetSelect/AssetSelect.tsx |    2 +-
 .../CurrenciesMenu}/CurrencyOption.tsx        |   22 +-
 .../TopUpInput/CurrenciesMenu/index.tsx}      |   36 +-
 .../TopUpInput/StaticCurrencyImage.tsx        |   47 +
 .../TopUpInput}/TopUpInputHeader.tsx          |   38 +-
 .../TopUpInput/index.tsx}                     |   50 +-
 src/app/templates/TopUpInput/types.ts         |   39 +
 .../TopUpInput/utils.ts}                      |   17 +-
 .../advertising-overlay.tsx                   |    7 +-
 src/bs58check.d.ts                            |    1 -
 src/confirm.tsx                               |    3 -
 src/fullpage.tsx                              |    3 -
 src/lib/analytics/index.ts                    |    1 +
 src/lib/analytics/test-id.utils.ts            |    3 +
 src/lib/apis/utorg.ts                         |   24 +-
 src/lib/browser/index.ts                      |    8 +
 src/lib/{browser-info.ts => browser/info.ts}  |   17 +-
 src/lib/env.ts                                |    2 +
 .../lib/icons/assets/fiat-fallback.svg        |    0
 src/lib/icons/assets/token-fallback.png       |  Bin 0 -> 15838 bytes
 src/lib/icons/fiat.ts                         |    8 +
 .../fiat-logos => src/lib/icons/fiat}/uah.svg |    0
 src/lib/icons/index.ts                        |    3 +
 src/lib/icons/tokens.ts                       |    9 +
 src/lib/image-uri.ts                          |   54 +-
 src/lib/intercom/client.ts                    |   37 +-
 src/lib/intercom/server.ts                    |    2 +
 src/lib/ledger/proxy/foreground.ts            |    2 +-
 src/lib/ledger/proxy/signer.ts                |    2 +-
 src/lib/ledger/proxy/utils.ts                 |    3 -
 src/lib/temple/activity-new/utils.ts          |    5 +-
 src/lib/temple/back/actions.ts                |   62 +-
 src/lib/temple/back/dapp.ts                   |   81 +-
 src/lib/temple/back/ledger.ts                 |    5 +-
 src/lib/temple/back/main.ts                   |   30 +-
 src/lib/temple/back/store.ts                  |    3 +-
 src/lib/temple/back/{ => vault}/helpers.ts    |    0
 .../temple/back/{vault.ts => vault/index.ts}  |  292 +---
 src/lib/temple/back/vault/migrations.ts       |  134 ++
 src/lib/temple/back/vault/misc.ts             |   73 +
 .../back/{ => vault}/safe-storage.test.ts     |    0
 .../temple/back/{ => vault}/safe-storage.ts   |    0
 src/lib/temple/back/vault/session-store.ts    |   41 +
 src/lib/temple/back/vault/storage-keys.ts     |   34 +
 src/lib/temple/back/{ => vault}/vault.test.ts |    4 +-
 src/lib/temple/beacon.ts                      |    3 +-
 src/lib/temple/front/assets.ts                |    8 +-
 src/lib/temple/front/helpers.ts               |    3 +-
 src/lib/temple/passworder.ts                  |    8 +-
 src/lib/temple/reset.ts                       |    4 +-
 src/lib/types.d.ts                            |    2 +
 src/lib/ui/Image.tsx                          |   45 +-
 src/lib/utils/buffers.ts                      |   26 +
 src/lib/{utils.ts => utils/index.ts}          |    2 +
 src/lib/{ => utils}/utils.test.ts             |    2 +-
 src/lib/woozie/Link.tsx                       |   10 +-
 src/popup.tsx                                 |    3 -
 webpack.config.js                             |  612 -------
 webpack.config.ts                             |  260 +++
 webpack/base.config.ts                        |  405 +++++
 webpack/env.ts                                |   59 +
 webpack/live-reload/client.ts                 |   12 +
 webpack/live-reload/index.ts                  |   59 +
 webpack/manifest.ts                           |  168 ++
 webpack/paths.ts                              |   84 +
 webpack/plugins.d.ts                          |    3 +
 webpack/tsconfig.json                         |   12 +
 webpack/utils.ts                              |    4 +
 webpack/zip-script.ts                         |   14 +
 yarn.lock                                     | 1464 +++++++++++------
 148 files changed, 4851 insertions(+), 2511 deletions(-)
 create mode 100644 .github/workflows/e2e/action.yml
 create mode 100644 e2e/.env.dist
 create mode 100644 e2e/cucumber.json
 create mode 100644 e2e/package.json
 create mode 100644 e2e/src/classes/browser-context.class.ts
 create mode 100644 e2e/src/classes/page.class.ts
 create mode 100644 e2e/src/features/import-existing-wallet.feature
 create mode 100644 e2e/src/hooks/after-all.hook.ts
 create mode 100644 e2e/src/hooks/before-all.hook.ts
 create mode 100644 e2e/src/hooks/before.hook.ts
 create mode 100644 e2e/src/page-objects/index.ts
 create mode 100644 e2e/src/page-objects/pages/header.page.ts
 create mode 100644 e2e/src/page-objects/pages/importing-existing-wallet.page.ts
 create mode 100644 e2e/src/page-objects/pages/setWalletPassword.page.ts
 create mode 100644 e2e/src/page-objects/pages/welcome.page.ts
 create mode 100644 e2e/src/step-definitions/common.steps.ts
 create mode 100644 e2e/src/utils/browser-context.utils.ts
 create mode 100644 e2e/src/utils/browser.utils.ts
 create mode 100644 e2e/src/utils/env.utils.ts
 create mode 100644 e2e/src/utils/input.utils.ts
 create mode 100644 e2e/src/utils/search.utils.ts
 create mode 100644 e2e/src/utils/shared-steps.utils.ts
 create mode 100644 e2e/tsconfig.json
 create mode 100644 e2e/yarn.lock
 delete mode 100644 public/manifest.json
 delete mode 100644 public/misc/baker.svg
 delete mode 100644 public/misc/exchangers-logos/quipuswap-logo.png
 delete mode 100644 src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx
 delete mode 100644 src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.props.ts
 delete mode 100644 src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInputHeader/TopUpInputHeader.tsx
 delete mode 100644 src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx
 delete mode 100644 src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrencyOption/CurrencyOption.tsx
 delete mode 100644 src/app/pages/Buy/Debit/Utorg/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx
 delete mode 100644 src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.props.ts
 delete mode 100644 src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.tsx
 delete mode 100644 src/app/pages/Buy/Debit/Utorg/config.ts
 delete mode 100644 src/app/pages/Buy/Debit/Utorg/hooks/useFilteredCurrencies.hook.ts
 create mode 100644 src/app/pages/Buy/Debit/Utorg/utils.ts
 create mode 100644 src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.test-ids.ts
 rename src/app/pages/NewWallet/import/{ => ImportSeedPhrase}/ImportFromSeedPhrase.tsx (80%)
 create mode 100644 src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.test-ids.ts
 rename src/app/pages/NewWallet/{ => setWalletPassword}/SetWalletPassword.tsx (90%)
 create mode 100644 src/app/pages/Welcome/Welcome.test-ids.ts
 rename src/app/pages/{ => Welcome}/Welcome.tsx (91%)
 rename src/app/{pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrencyOption => templates/TopUpInput/CurrenciesMenu}/CurrencyOption.tsx (68%)
 rename src/app/{pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx => templates/TopUpInput/CurrenciesMenu/index.tsx} (72%)
 create mode 100644 src/app/templates/TopUpInput/StaticCurrencyImage.tsx
 rename src/app/{pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInputHeader => templates/TopUpInput}/TopUpInputHeader.tsx (89%)
 rename src/app/{pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.tsx => templates/TopUpInput/index.tsx} (68%)
 create mode 100644 src/app/templates/TopUpInput/types.ts
 rename src/app/{pages/Buy/Crypto/Exolix/hooks/useFilteredCurrencies.hook.ts => templates/TopUpInput/utils.ts} (50%)
 delete mode 100644 src/bs58check.d.ts
 create mode 100644 src/lib/analytics/test-id.utils.ts
 create mode 100644 src/lib/browser/index.ts
 rename src/lib/{browser-info.ts => browser/info.ts} (74%)
 rename public/misc/token-logos/fallback.svg => src/lib/icons/assets/fiat-fallback.svg (100%)
 create mode 100644 src/lib/icons/assets/token-fallback.png
 create mode 100644 src/lib/icons/fiat.ts
 rename {public/misc/fiat-logos => src/lib/icons/fiat}/uah.svg (100%)
 create mode 100644 src/lib/icons/tokens.ts
 delete mode 100644 src/lib/ledger/proxy/utils.ts
 rename src/lib/temple/back/{ => vault}/helpers.ts (100%)
 rename src/lib/temple/back/{vault.ts => vault/index.ts} (68%)
 create mode 100644 src/lib/temple/back/vault/migrations.ts
 create mode 100644 src/lib/temple/back/vault/misc.ts
 rename src/lib/temple/back/{ => vault}/safe-storage.test.ts (100%)
 rename src/lib/temple/back/{ => vault}/safe-storage.ts (100%)
 create mode 100644 src/lib/temple/back/vault/session-store.ts
 create mode 100644 src/lib/temple/back/vault/storage-keys.ts
 rename src/lib/temple/back/{ => vault}/vault.test.ts (99%)
 create mode 100644 src/lib/utils/buffers.ts
 rename src/lib/{utils.ts => utils/index.ts} (91%)
 rename src/lib/{ => utils}/utils.test.ts (94%)
 delete mode 100644 webpack.config.js
 create mode 100644 webpack.config.ts
 create mode 100644 webpack/base.config.ts
 create mode 100644 webpack/env.ts
 create mode 100644 webpack/live-reload/client.ts
 create mode 100644 webpack/live-reload/index.ts
 create mode 100644 webpack/manifest.ts
 create mode 100644 webpack/paths.ts
 create mode 100644 webpack/plugins.d.ts
 create mode 100644 webpack/tsconfig.json
 create mode 100644 webpack/utils.ts
 create mode 100644 webpack/zip-script.ts

diff --git a/.env b/.env
index 435ef56fc1..499111b5ae 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,6 @@
-TEMPLE_WALLET_LEDGER_BRIDGE_URL = https://templewallet.com/ledger-bridge-v2.0.1
 TEMPLE_WALLET_LOGO_URL = https://templewallet.com/logo.png
 TEMPLE_WALLET_SEGMENT_WRITE_KEY = N1pFDJgp6ZJ6s5zfTM0cDhUWWhnE1TkS
 TEMPLE_WALLET_EXOLIX_API_KEY =
-TEMPLE_WALLET_EVERSTAKE_API_KEY = 
-TEMPLE_WALLET_EVERSTAKE_LINK_ID = 
-TEMPLE_WALLET_UTORG_SID =
\ No newline at end of file
+TEMPLE_WALLET_EVERSTAKE_API_KEY =
+TEMPLE_WALLET_EVERSTAKE_LINK_ID =
+TEMPLE_WALLET_UTORG_SID =
diff --git a/.eslintrc b/.eslintrc
index cedd698e74..b6e825ebe5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,9 +1,18 @@
 {
-  "extends": ["react-app", "plugin:import/errors", "plugin:import/warnings", "plugin:import/typescript"],
+  "extends": [
+    "react-app",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "plugin:import/typescript"
+  ],
   "plugins": ["import", "prettier"],
+  "parser": "@typescript-eslint/parser",
   "settings": {
     "import/resolver": {
-      "typescript": {}
+      "typescript": {},
+      "node": {
+        "extensions": [".d.ts"]
+      }
     }
   },
   "rules": {
diff --git a/.github/workflows/code-quality-check/action.yml b/.github/workflows/code-quality-check/action.yml
index a0b5b5d8f6..7638a13b06 100644
--- a/.github/workflows/code-quality-check/action.yml
+++ b/.github/workflows/code-quality-check/action.yml
@@ -1,5 +1,5 @@
 name: Code quality check
-description: Installs dependencies and checks if ts, lint, unit tests
+description: Installs dependencies and checks TS, linting, dead code
 runs:
   using: 'composite'
   steps:
@@ -18,6 +18,6 @@ runs:
       run: yarn lint
       shell: bash
 
-    - name: Run Unit tests
+    - name: Perform unit tests
       run: yarn test:coverage
       shell: bash
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index 6ce509c0e9..126e70aa3a 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   pull-request-check:
-    name: Checks if ts, lint, unit tests & build works
+    name: Checks if ts, lint, tests & build work
     runs-on: ubuntu-latest
     environment: production
     steps:
@@ -39,12 +39,19 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - name: Install dependencies and code quality
+      - name: Install dependencies and code quality check
         uses: ./.github/workflows/code-quality-check
 
       - name: Create Chrome build
         run: yarn build:chrome
 
+      - name: Perform end-to-end tests
+        uses: ./.github/workflows/e2e
+        with:
+          DEFAULT_SEED_PHRASE: ${{ secrets.DEFAULT_SEED_PHRASE }}
+          DEFAULT_PASSWORD: ${{ secrets.DEFAULT_PASSWORD }}
+          DEFAULT_HD_ACCOUNT_PRIVATE_KEY: ${{ secrets.DEFAULT_HD_ACCOUNT_PRIVATE_KEY }}
+
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/e2e/action.yml b/.github/workflows/e2e/action.yml
new file mode 100644
index 0000000000..451cc35111
--- /dev/null
+++ b/.github/workflows/e2e/action.yml
@@ -0,0 +1,40 @@
+name: End-to-end tests
+
+description: Prepares and runs e2e tests
+
+inputs:
+  DEFAULT_SEED_PHRASE:
+    required: true
+  DEFAULT_PASSWORD:
+    required: true
+  DEFAULT_HD_ACCOUNT_PRIVATE_KEY:
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - working-directory: ./e2e
+      shell: bash
+      run: yarn install
+
+    - name: Secrets setup
+      working-directory: ./e2e
+      shell: bash
+      run: |
+        cat << EOF > .env
+        DEFAULT_SEED_PHRASE=${{ inputs.DEFAULT_SEED_PHRASE }}
+        DEFAULT_PASSWORD=${{ inputs.DEFAULT_PASSWORD }}
+        DEFAULT_HD_ACCOUNT_PRIVATE_KEY=${{ inputs.DEFAULT_HD_ACCOUNT_PRIVATE_KEY }}
+        EOF
+
+    - name: Run tests
+      working-directory: ./e2e
+      shell: bash
+      env:
+        PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 'true'
+        CI: 'true'
+      run: |
+        export DISPLAY=:99
+        chromedriver --url-base=/wd/hub &
+        sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
+        yarn test
diff --git a/.gitignore b/.gitignore
index 6291732429..fa6107fc9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules/
 /.pnp
 .pnp.js
 
@@ -12,7 +12,8 @@
 /dist
 
 # Env
-.env.*
+.env*
+!.env.dist
 
 # misc
 .DS_Store
diff --git a/e2e/.env.dist b/e2e/.env.dist
new file mode 100644
index 0000000000..1f2cafbb5c
--- /dev/null
+++ b/e2e/.env.dist
@@ -0,0 +1,3 @@
+DEFAULT_SEED_PHRASE=
+DEFAULT_PASSWORD=
+DEFAULT_HD_ACCOUNT_PRIVATE_KEY=
diff --git a/e2e/cucumber.json b/e2e/cucumber.json
new file mode 100644
index 0000000000..30ddb4be7c
--- /dev/null
+++ b/e2e/cucumber.json
@@ -0,0 +1,7 @@
+{
+  "default": {
+    "paths": ["src/features/**/*.feature"],
+    "require": ["src/**/*.ts"],
+    "requireModule": ["ts-node/register"]
+  }
+}
diff --git a/e2e/package.json b/e2e/package.json
new file mode 100644
index 0000000000..f5d0bdab9b
--- /dev/null
+++ b/e2e/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "temple-wallet-extension-e2e",
+  "version": "1.0.0",
+  "private": true,
+  "license": "MIT",
+  "scripts": {
+    "start": "./node_modules/.bin/cucumber-js",
+    "start:dev": "yarn start --tags @dev",
+    "test": "yarn start --exit",
+    "ts": "tsc --pretty"
+  },
+  "dependencies": {
+    "@cucumber/cucumber": "^8.7.0",
+    "puppeteer": "^19.4.0",
+    "ts-node": "^10.9.1",
+    "dotenv": "^16.0.3"
+  }
+}
diff --git a/e2e/src/classes/browser-context.class.ts b/e2e/src/classes/browser-context.class.ts
new file mode 100644
index 0000000000..c9e5db1838
--- /dev/null
+++ b/e2e/src/classes/browser-context.class.ts
@@ -0,0 +1,18 @@
+import { Browser, Page } from 'puppeteer';
+
+import { getEnv } from '../utils/env.utils';
+
+const defaultSeedPhrase = getEnv('DEFAULT_SEED_PHRASE');
+const defaultPassword = getEnv('DEFAULT_PASSWORD');
+const defaultPrivateKey = getEnv('DEFAULT_HD_ACCOUNT_PRIVATE_KEY');
+
+if (!defaultSeedPhrase) throw new Error('process.env.DEFAULT_SEED_PHRASE not found.');
+if (!defaultPassword) throw new Error('process.env.DEFAULT_PASSWORD not found.');
+
+export class BrowserContext {
+  public static browser: Browser;
+  public static page: Page;
+  public static seedPhrase = defaultSeedPhrase;
+  public static password = defaultPassword;
+  public static privateKey = defaultPrivateKey;
+}
diff --git a/e2e/src/classes/page.class.ts b/e2e/src/classes/page.class.ts
new file mode 100644
index 0000000000..5e6ae4c043
--- /dev/null
+++ b/e2e/src/classes/page.class.ts
@@ -0,0 +1,3 @@
+export abstract class Page {
+  abstract isVisible(): void;
+}
diff --git a/e2e/src/features/import-existing-wallet.feature b/e2e/src/features/import-existing-wallet.feature
new file mode 100644
index 0000000000..a9018292a5
--- /dev/null
+++ b/e2e/src/features/import-existing-wallet.feature
@@ -0,0 +1,19 @@
+Feature: Import existing wallet
+  @dev
+  Scenario: As a user, I'd like to import account with existing seed phrase
+    Given I am on the Welcome page
+    And I press Import Existing Wallet button on the Welcome page
+
+    And I am on the ImportExistingWallet page
+    And I enter my mnemonic
+    And I press Next button on the Import Existing Seed Phrase page
+
+    And I am on the SetWallet page
+    And I enter password into Password Field on the Register Form page
+    And I enter password into Repeat Password Field on the Register Form page
+    And I press Skip Onboarding Checkbox on the Register Form page
+    And I press Accept Terms Checkbox on the Register Form page
+    And I press Import Button on the Register Form page
+
+    Then I am on the Header page
+
diff --git a/e2e/src/hooks/after-all.hook.ts b/e2e/src/hooks/after-all.hook.ts
new file mode 100644
index 0000000000..302c81b423
--- /dev/null
+++ b/e2e/src/hooks/after-all.hook.ts
@@ -0,0 +1,7 @@
+import { AfterAll } from '@cucumber/cucumber';
+
+import { BrowserContext } from '../classes/browser-context.class';
+
+AfterAll(async () => {
+  await BrowserContext.browser.close();
+});
diff --git a/e2e/src/hooks/before-all.hook.ts b/e2e/src/hooks/before-all.hook.ts
new file mode 100644
index 0000000000..b551f5ea2c
--- /dev/null
+++ b/e2e/src/hooks/before-all.hook.ts
@@ -0,0 +1,15 @@
+import { BeforeAll } from '@cucumber/cucumber';
+
+import { initBrowserContext } from '../utils/browser-context.utils';
+import { initBrowser } from '../utils/browser.utils';
+
+const LONG_TIMEOUT = 20 * 1000;
+BeforeAll({ timeout: LONG_TIMEOUT }, async () => {
+  const browser = await initBrowser();
+
+  const [blankPage] = await browser.pages();
+  await blankPage.goto('https://www.google.com/');
+  await blankPage.close();
+
+  await initBrowserContext(browser);
+});
diff --git a/e2e/src/hooks/before.hook.ts b/e2e/src/hooks/before.hook.ts
new file mode 100644
index 0000000000..7857b0a91f
--- /dev/null
+++ b/e2e/src/hooks/before.hook.ts
@@ -0,0 +1,8 @@
+import { Before } from '@cucumber/cucumber';
+
+import { BrowserContext } from '../classes/browser-context.class';
+
+Before(async () => {
+  await BrowserContext.page.evaluate(() => void localStorage.clear());
+  await BrowserContext.page.reload();
+});
diff --git a/e2e/src/page-objects/index.ts b/e2e/src/page-objects/index.ts
new file mode 100644
index 0000000000..0f488faf20
--- /dev/null
+++ b/e2e/src/page-objects/index.ts
@@ -0,0 +1,11 @@
+import { HeaderPage } from './pages/header.page';
+import { ImportExistingWalletPage } from './pages/importing-existing-wallet.page';
+import { setWalletPage } from './pages/setWalletPassword.page';
+import { WelcomePage } from './pages/welcome.page';
+
+export const Pages = {
+  Welcome: new WelcomePage(),
+  ImportExistingWallet: new ImportExistingWalletPage(),
+  SetWallet: new setWalletPage(),
+  Header: new HeaderPage()
+};
diff --git a/e2e/src/page-objects/pages/header.page.ts b/e2e/src/page-objects/pages/header.page.ts
new file mode 100644
index 0000000000..876a84706b
--- /dev/null
+++ b/e2e/src/page-objects/pages/header.page.ts
@@ -0,0 +1,13 @@
+import { HeaderSelectors } from '../../../../src/app/layouts/PageLayout/Header.selectors';
+import { Page } from '../../classes/page.class';
+import { createPageElement } from '../../utils/search.utils';
+
+export class HeaderPage extends Page {
+  accountIconButton = createPageElement(HeaderSelectors.AccountIcon);
+  templeLogoButton = createPageElement(HeaderSelectors.TempleLogo);
+
+  async isVisible() {
+    await this.accountIconButton.waitForDisplayed();
+    await this.templeLogoButton.waitForDisplayed();
+  }
+}
diff --git a/e2e/src/page-objects/pages/importing-existing-wallet.page.ts b/e2e/src/page-objects/pages/importing-existing-wallet.page.ts
new file mode 100644
index 0000000000..bd03180a8c
--- /dev/null
+++ b/e2e/src/page-objects/pages/importing-existing-wallet.page.ts
@@ -0,0 +1,16 @@
+import { ImportFromSeedPhraseTestIds } from '../../../../src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.test-ids';
+import { Page } from '../../classes/page.class';
+import { createPageElement, findElements } from '../../utils/search.utils';
+
+export class ImportExistingWalletPage extends Page {
+  nextButton = createPageElement(ImportFromSeedPhraseTestIds.nextButton);
+  wordInput = createPageElement(ImportFromSeedPhraseTestIds.wordInput);
+
+  async isVisible() {
+    await this.nextButton.waitForDisplayed();
+    await this.wordInput.waitForDisplayed();
+  }
+  async getWordsInputs() {
+    return findElements(ImportFromSeedPhraseTestIds.wordInput);
+  }
+}
diff --git a/e2e/src/page-objects/pages/setWalletPassword.page.ts b/e2e/src/page-objects/pages/setWalletPassword.page.ts
new file mode 100644
index 0000000000..a71eb5364e
--- /dev/null
+++ b/e2e/src/page-objects/pages/setWalletPassword.page.ts
@@ -0,0 +1,19 @@
+import { setWalletPasswordTestIDS } from '../../../../src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.test-ids';
+import { Page } from '../../classes/page.class';
+import { createPageElement } from '../../utils/search.utils';
+
+export class setWalletPage extends Page {
+  passwordField = createPageElement(setWalletPasswordTestIDS.passwordField);
+  repeatPasswordField = createPageElement(setWalletPasswordTestIDS.repeatPasswordField);
+  skipOnboarding = createPageElement(setWalletPasswordTestIDS.skipOnboardingCheckbox);
+  acceptTerms = createPageElement(setWalletPasswordTestIDS.acceptTermsCheckbox);
+  importButton = createPageElement(setWalletPasswordTestIDS.importButton);
+
+  async isVisible() {
+    await this.passwordField.waitForDisplayed();
+    await this.repeatPasswordField.waitForDisplayed();
+    await this.skipOnboarding.waitForDisplayed();
+    await this.acceptTerms.waitForDisplayed();
+    await this.importButton.waitForDisplayed();
+  }
+}
diff --git a/e2e/src/page-objects/pages/welcome.page.ts b/e2e/src/page-objects/pages/welcome.page.ts
new file mode 100644
index 0000000000..1dfd06d572
--- /dev/null
+++ b/e2e/src/page-objects/pages/welcome.page.ts
@@ -0,0 +1,13 @@
+import { WelcomeTestIds } from '../../../../src/app/pages/Welcome/Welcome.test-ids';
+import { Page } from '../../classes/page.class';
+import { createPageElement } from '../../utils/search.utils';
+
+export class WelcomePage extends Page {
+  createNewWalletButton = createPageElement(WelcomeTestIds.createNewWallet);
+  importExistingWalletButton = createPageElement(WelcomeTestIds.importExistingWallet);
+
+  async isVisible() {
+    await this.createNewWalletButton.waitForDisplayed();
+    await this.importExistingWalletButton.waitForDisplayed();
+  }
+}
diff --git a/e2e/src/step-definitions/common.steps.ts b/e2e/src/step-definitions/common.steps.ts
new file mode 100644
index 0000000000..fba0ebc7df
--- /dev/null
+++ b/e2e/src/step-definitions/common.steps.ts
@@ -0,0 +1,27 @@
+import { Given } from '@cucumber/cucumber';
+
+import { Pages } from '../page-objects';
+import { getInputText } from '../utils/input.utils';
+import { createPageElement } from '../utils/search.utils';
+import { enterMyMnemonicStep } from '../utils/shared-steps.utils';
+
+Given(/^I am on the (\w+) page$/, async (page: keyof typeof Pages) => {
+  await Pages[page].isVisible();
+});
+
+Given(/I press (.*) on the (.*) page/, async (elementName: string, pageName: string) => {
+  await createPageElement(`${pageName}/${elementName}`).click();
+});
+
+Given(/I enter my mnemonic/, async () => {
+  await enterMyMnemonicStep();
+});
+
+Given(
+  /I enter (seed|password) into (.*) on the (.*) page/,
+  async (inputType: string, elementName: string, pageName: string) => {
+    const inputText = getInputText(inputType);
+
+    await createPageElement(`${pageName}/${elementName}`).type(inputText);
+  }
+);
diff --git a/e2e/src/utils/browser-context.utils.ts b/e2e/src/utils/browser-context.utils.ts
new file mode 100644
index 0000000000..32ac1db8ea
--- /dev/null
+++ b/e2e/src/utils/browser-context.utils.ts
@@ -0,0 +1,10 @@
+import { Browser } from 'puppeteer';
+
+import { BrowserContext } from '../classes/browser-context.class';
+
+export const initBrowserContext = async (browser: Browser) => {
+  const [page] = await browser.pages();
+
+  BrowserContext.browser = browser;
+  BrowserContext.page = page;
+};
diff --git a/e2e/src/utils/browser.utils.ts b/e2e/src/utils/browser.utils.ts
new file mode 100644
index 0000000000..78839fe69b
--- /dev/null
+++ b/e2e/src/utils/browser.utils.ts
@@ -0,0 +1,10 @@
+import path from 'path';
+import { launch } from 'puppeteer';
+
+const EXTENSION_PATH = path.resolve(__dirname, '../../../dist/chrome_unpacked');
+
+export const initBrowser = () =>
+  launch({
+    headless: false,
+    args: [`--disable-extensions-except=${EXTENSION_PATH}`, `--load-extension=${EXTENSION_PATH}`]
+  });
diff --git a/e2e/src/utils/env.utils.ts b/e2e/src/utils/env.utils.ts
new file mode 100644
index 0000000000..64f6c753db
--- /dev/null
+++ b/e2e/src/utils/env.utils.ts
@@ -0,0 +1,5 @@
+import * as dotenv from 'dotenv';
+
+dotenv.config();
+
+export const getEnv = (key: string) => process.env[key] ?? '';
diff --git a/e2e/src/utils/input.utils.ts b/e2e/src/utils/input.utils.ts
new file mode 100644
index 0000000000..d74265b210
--- /dev/null
+++ b/e2e/src/utils/input.utils.ts
@@ -0,0 +1,16 @@
+import { BrowserContext } from '../classes/browser-context.class';
+
+export const getInputText = (inputType: string) => {
+  let inputText = '';
+
+  switch (inputType) {
+    case 'seed':
+      inputText = BrowserContext.seedPhrase;
+      break;
+    case 'password':
+      inputText = BrowserContext.password;
+      break;
+  }
+
+  return inputText;
+};
diff --git a/e2e/src/utils/search.utils.ts b/e2e/src/utils/search.utils.ts
new file mode 100644
index 0000000000..7cf13bab4b
--- /dev/null
+++ b/e2e/src/utils/search.utils.ts
@@ -0,0 +1,46 @@
+import { isDefined } from '@rnw-community/shared';
+
+import { BrowserContext } from '../classes/browser-context.class';
+
+const getSelector = (testID: string) => `[data-testid="${testID}"]`;
+
+const findElement = async (testID: string) => {
+  const selector = getSelector(testID);
+
+  const element = await BrowserContext.page.waitForSelector(selector, { visible: true, timeout: 3000 });
+
+  if (isDefined(element)) {
+    return element;
+  }
+
+  throw new Error(`"${testID}" not found`);
+};
+
+export const findElements = async (testID: string) => {
+  const selector = getSelector(testID);
+
+  const elements = await BrowserContext.page.$$(selector);
+
+  if (elements.length !== 0) {
+    return elements;
+  }
+
+  throw new Error(`None of "${testID}" elements where found found`);
+};
+
+export const createPageElement = (testID: string) => ({
+  waitForDisplayed: async () => findElement(testID),
+  click: async () => {
+    const element = await findElement(testID);
+    await element.click();
+  },
+  type: async (text: string) => {
+    const element = await findElement(testID);
+    await element.type(text);
+  },
+  getText: async () => {
+    const element = await findElement(testID);
+
+    return element.evaluate(innerElement => innerElement.textContent);
+  }
+});
diff --git a/e2e/src/utils/shared-steps.utils.ts b/e2e/src/utils/shared-steps.utils.ts
new file mode 100644
index 0000000000..75679570fa
--- /dev/null
+++ b/e2e/src/utils/shared-steps.utils.ts
@@ -0,0 +1,14 @@
+import { BrowserContext } from '../classes/browser-context.class';
+import { Pages } from '../page-objects';
+
+export const enterMyMnemonicStep = async () => {
+  const wordsArray = BrowserContext.seedPhrase.split(' ');
+  const wordsInputs = await Pages.ImportExistingWallet.getWordsInputs();
+
+  for (let i = 0; i < wordsArray.length; i++) {
+    const word = wordsArray[i];
+    const input = wordsInputs[i];
+
+    await input.type(word);
+  }
+};
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
new file mode 100644
index 0000000000..5c028cfeb1
--- /dev/null
+++ b/e2e/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  }
+}
diff --git a/e2e/yarn.lock b/e2e/yarn.lock
new file mode 100644
index 0000000000..c52a1c1bee
--- /dev/null
+++ b/e2e/yarn.lock
@@ -0,0 +1,1278 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.0.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
+"@babel/helper-validator-identifier@^7.18.6":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/runtime@^7.15.4":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
+  integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
+  dependencies:
+    "@jridgewell/trace-mapping" "0.3.9"
+
+"@cucumber/ci-environment@9.1.0":
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/ci-environment/-/ci-environment-9.1.0.tgz#6d868141c7cfd616931f14723e122a1069401998"
+  integrity sha512-jdnF6APXP3GawMue8kdMxhu6TBhyRUO4KDRxTowf06NtclLjIw2Ybpo9IcIOMvE8kHukvJyM00uxWX+CfS7JgQ==
+
+"@cucumber/cucumber-expressions@16.0.0":
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/cucumber-expressions/-/cucumber-expressions-16.0.0.tgz#f8bc43da26f12db8f0d74ff3031a881e4fa4516d"
+  integrity sha512-HTh+Pg7oQ5aLuCkSbD2Q6jBaE40M3R/XaLEz+UqD5d9dZRu6P38W4LTooV5bV6dZgBunlMLK8+6ug2ziYvRddw==
+  dependencies:
+    regexp-match-indices "1.0.2"
+
+"@cucumber/cucumber@^8.7.0":
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/cucumber/-/cucumber-8.9.0.tgz#394ed87093af33fbb235bee1970a3368bbb2ffc5"
+  integrity sha512-kU44RHVbS6fNLrEVQAzTtTMP6pDh0gMzB+QXULNymqGGhXDpnk+6PEH88+YG0TsjjPSYYNwOc3mhN/zvQ28yAg==
+  dependencies:
+    "@cucumber/ci-environment" "9.1.0"
+    "@cucumber/cucumber-expressions" "16.0.0"
+    "@cucumber/gherkin" "24.1.0"
+    "@cucumber/gherkin-streams" "5.0.1"
+    "@cucumber/gherkin-utils" "8.0.1"
+    "@cucumber/html-formatter" "20.1.0"
+    "@cucumber/message-streams" "4.0.1"
+    "@cucumber/messages" "20.0.0"
+    "@cucumber/tag-expressions" "4.1.0"
+    assertion-error-formatter "^3.0.0"
+    capital-case "^1.0.4"
+    chalk "^4.1.2"
+    cli-table3 "0.6.3"
+    commander "^9.0.0"
+    debug "^4.3.4"
+    duration "^0.2.2"
+    durations "^3.4.2"
+    error-stack-parser "^2.1.4"
+    figures "^3.2.0"
+    glob "^7.1.6"
+    has-ansi "^4.0.1"
+    indent-string "^4.0.0"
+    is-installed-globally "^0.4.0"
+    is-stream "^2.0.0"
+    knuth-shuffle-seeded "^1.0.6"
+    lodash.merge "^4.6.2"
+    lodash.mergewith "^4.6.2"
+    mz "^2.7.0"
+    progress "^2.0.3"
+    resolve-pkg "^2.0.0"
+    semver "7.3.8"
+    string-argv "^0.3.1"
+    strip-ansi "6.0.1"
+    supports-color "^8.1.1"
+    tmp "^0.2.1"
+    util-arity "^1.1.0"
+    verror "^1.10.0"
+    xmlbuilder "^15.1.1"
+    yup "^0.32.11"
+
+"@cucumber/gherkin-streams@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@cucumber/gherkin-streams/-/gherkin-streams-5.0.1.tgz#8c2142d295cd05644456be7282b4bd756c95c4cd"
+  integrity sha512-/7VkIE/ASxIP/jd4Crlp4JHXqdNFxPGQokqWqsaCCiqBiu5qHoKMxcWNlp9njVL/n9yN4S08OmY3ZR8uC5x74Q==
+  dependencies:
+    commander "9.1.0"
+    source-map-support "0.5.21"
+
+"@cucumber/gherkin-utils@8.0.1":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@cucumber/gherkin-utils/-/gherkin-utils-8.0.1.tgz#d9489f3dfc1912f3ae1303aa9a083c966218722c"
+  integrity sha512-SjDcCYQMEX4yCUoOJU38+UZo2p0Mxh1WnvwoJ3rSnun5HhhLrAn2p/Hnbiq4kudYJkAuQcEXlFOllJ3ZTwztIg==
+  dependencies:
+    "@cucumber/gherkin" "^24.1.0"
+    "@cucumber/messages" "^19.1.4"
+    "@teppeis/multimaps" "2.0.0"
+    commander "9.4.1"
+    source-map-support "^0.5.21"
+
+"@cucumber/gherkin@24.1.0", "@cucumber/gherkin@^24.1.0":
+  version "24.1.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/gherkin/-/gherkin-24.1.0.tgz#ca2dcbe11f5f7d7f30fd073280550bd6eca2363c"
+  integrity sha512-B48XrUod4y3SoXe6mv12q7U1zThUNSK3yHSm/hBJCJZ6RJUJhFk3FVMN/83qOEbsYZe6iG9v+4L1Myf8/q8C6g==
+  dependencies:
+    "@cucumber/messages" "^19.1.4"
+
+"@cucumber/html-formatter@20.1.0":
+  version "20.1.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/html-formatter/-/html-formatter-20.1.0.tgz#2eda2bc93cbf7e50034430b8cfbd2e9ad80aba25"
+  integrity sha512-bu2shjZuVGfAtKaw8ebCBxhgu3Eiaz/P7ZuSxrw9YCa6rOyxMX5zO+4f2FUBTK/AV0b9O5cAB/xitYBrGhlYKg==
+
+"@cucumber/message-streams@4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@cucumber/message-streams/-/message-streams-4.0.1.tgz#a5339d3504594bb2edb5732aaae94dddb24d0970"
+  integrity sha512-Kxap9uP5jD8tHUZVjTWgzxemi/0uOsbGjd4LBOSxcJoOCRbESFwemUzilJuzNTB8pcTQUh8D5oudUyxfkJOKmA==
+
+"@cucumber/messages@20.0.0":
+  version "20.0.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/messages/-/messages-20.0.0.tgz#494d30bd2880b04dcb3a958f8c0ec5638b7b3596"
+  integrity sha512-JFrFwuhxsbig0afaViNhuzoQyC+GQzlI7m+rX+lSiDGV13K3sJzMmHjkbCiNOgoRlKAMwIGR9TRMH0xj9/My0w==
+  dependencies:
+    "@types/uuid" "8.3.4"
+    class-transformer "0.5.1"
+    reflect-metadata "0.1.13"
+    uuid "9.0.0"
+
+"@cucumber/messages@^19.1.4":
+  version "19.1.4"
+  resolved "https://registry.yarnpkg.com/@cucumber/messages/-/messages-19.1.4.tgz#5cefc47cac3004c0bc38d42933042ec248bb747c"
+  integrity sha512-Pksl0pnDz2l1+L5Ug85NlG6LWrrklN9qkMxN5Mv+1XZ3T6u580dnE6mVaxjJRdcOq4tR17Pc0RqIDZMyVY1FlA==
+  dependencies:
+    "@types/uuid" "8.3.4"
+    class-transformer "0.5.1"
+    reflect-metadata "0.1.13"
+    uuid "9.0.0"
+
+"@cucumber/tag-expressions@4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@cucumber/tag-expressions/-/tag-expressions-4.1.0.tgz#9a91b0e0dd2f2ba703e3038c52b49b9ac06c2c6f"
+  integrity sha512-chTnjxV3vryL75N90wJIMdMafXmZoO2JgNJLYpsfcALL2/IQrRiny3vM9DgD5RDCSt1LNloMtb7rGey9YWxCsA==
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/trace-mapping@0.3.9":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+"@teppeis/multimaps@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@teppeis/multimaps/-/multimaps-2.0.0.tgz#2114ee964b702f9777d0e07899087ad9cd89a0de"
+  integrity sha512-TL1adzq1HdxUf9WYduLcQ/DNGYiz71U31QRgbnr0Ef1cPyOUOsBojxHVWpFeOSUucB6Lrs0LxFRA14ntgtkc9w==
+
+"@tsconfig/node10@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e"
+  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+
+"@types/lodash@^4.14.175":
+  version "4.14.191"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.191.tgz#09511e7f7cba275acd8b419ddac8da9a6a79e2fa"
+  integrity sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==
+
+"@types/node@*":
+  version "18.11.15"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.15.tgz#de0e1fbd2b22b962d45971431e2ae696643d3f5d"
+  integrity sha512-VkhBbVo2+2oozlkdHXLrb3zjsRkpdnaU2bXmX8Wgle3PUi569eLRaHGlgETQHR7lLL1w7GiG3h9SnePhxNDecw==
+
+"@types/uuid@8.3.4":
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
+  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
+
+"@types/yauzl@^2.9.1":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
+  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
+  dependencies:
+    "@types/node" "*"
+
+acorn-walk@^8.1.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
+acorn@^8.4.1:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+ansi-regex@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+any-promise@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
+  integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
+
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
+
+assertion-error-formatter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/assertion-error-formatter/-/assertion-error-formatter-3.0.0.tgz#be9c8825dee6a8a6c72183d915912d9b57d5d265"
+  integrity sha512-6YyAVLrEze0kQ7CmJfUgrLHb+Y7XghmL2Ie7ijVa2Y9ynP3LV+VDiwFk62Dn0qtqbmY0BT0ss6p1xxpiF2PYbQ==
+  dependencies:
+    diff "^4.0.1"
+    pad-right "^0.2.2"
+    repeat-string "^1.6.1"
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+buffer@^5.2.1, buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+capital-case@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
+  integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+    upper-case-first "^2.0.2"
+
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+
+class-transformer@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/class-transformer/-/class-transformer-0.5.1.tgz#24147d5dffd2a6cea930a3250a677addf96ab336"
+  integrity sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==
+
+cli-table3@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
+  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
+  dependencies:
+    string-width "^4.2.0"
+  optionalDependencies:
+    "@colors/colors" "1.5.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+commander@9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.1.0.tgz#a6b263b2327f2e188c6402c42623327909f2dbec"
+  integrity sha512-i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w==
+
+commander@9.4.1, commander@^9.0.0:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+core-util-is@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+
+cosmiconfig@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97"
+  integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==
+  dependencies:
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
+cross-fetch@3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
+  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
+  dependencies:
+    node-fetch "2.6.7"
+
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+  dependencies:
+    es5-ext "^0.10.50"
+    type "^1.0.1"
+
+debug@4, debug@4.3.4, debug@^4.1.1, debug@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+devtools-protocol@0.0.1068969:
+  version "0.0.1068969"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz#8b9a4bc48aed1453bed08d62b07481f9abf4d6d8"
+  integrity sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ==
+
+diff@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
+
+dotenv@^16.0.3:
+  version "16.0.3"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
+  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+
+duration@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/duration/-/duration-0.2.2.tgz#ddf149bc3bc6901150fe9017111d016b3357f529"
+  integrity sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==
+  dependencies:
+    d "1"
+    es5-ext "~0.10.46"
+
+durations@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/durations/-/durations-3.4.2.tgz#1de230454373cccfecab927de0bebae2295301db"
+  integrity sha512-V/lf7y33dGaypZZetVI1eu7BmvkbC4dItq12OElLRpKuaU5JxQstV2zHwLv8P7cNbQ+KL1WD80zMCTx5dNC4dg==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+error-stack-parser@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
+  integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
+  dependencies:
+    stackframe "^1.3.4"
+
+es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.46:
+  version "0.10.62"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
+  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+  dependencies:
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.3"
+    next-tick "^1.1.0"
+
+es6-iterator@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-symbol@^3.1.1, es6-symbol@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  dependencies:
+    d "^1.0.1"
+    ext "^1.1.2"
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
+ext@^1.1.2:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
+  dependencies:
+    type "^2.7.2"
+
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+  dependencies:
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
+
+extsprintf@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
+  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
+
+fd-slicer@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
+  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
+  dependencies:
+    pend "~1.2.0"
+
+figures@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+get-stream@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
+glob@^7.1.3, glob@^7.1.6:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-dirs@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
+  integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==
+  dependencies:
+    ini "2.0.0"
+
+has-ansi@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-4.0.1.tgz#f216a8c8d7b129e490dc15f4a62cc1cdb9603ce8"
+  integrity sha512-Qr4RtTm30xvEdqUXbSBVWDu+PrTokJOwe/FU+VdfJPk+MXAPoeOzKpRyrDTnZIJwAkQ4oBLTU53nu0HrkF/Z2A==
+  dependencies:
+    ansi-regex "^4.1.0"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+https-proxy-agent@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.3, inherits@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-installed-globally@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
+  integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
+  dependencies:
+    global-dirs "^3.0.0"
+    is-path-inside "^3.0.2"
+
+is-path-inside@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+knuth-shuffle-seeded@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/knuth-shuffle-seeded/-/knuth-shuffle-seeded-1.0.6.tgz#01f1b65733aa7540ee08d8b0174164d22081e4e1"
+  integrity sha512-9pFH0SplrfyKyojCLxZfMcvkhf5hH0d+UwR9nTVJ/DDQJGuzcXjTwB7TP7sDfehSudlGGaOLblmEWqv04ERVWg==
+  dependencies:
+    seed-random "~2.2.0"
+
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
+lodash.mergewith@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
+  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
+
+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+  dependencies:
+    tslib "^2.0.3"
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
+minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+mkdirp-classic@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+mz@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
+  integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==
+  dependencies:
+    any-promise "^1.0.0"
+    object-assign "^4.0.1"
+    thenify-all "^1.0.0"
+
+nanoclone@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4"
+  integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==
+
+next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+  dependencies:
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
+
+node-fetch@2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+object-assign@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+pad-right@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/pad-right/-/pad-right-0.2.2.tgz#6fbc924045d244f2a2a244503060d3bfc6009774"
+  integrity sha512-4cy8M95ioIGolCoMmm2cMntGR1lPLEbOMzOKu8bzjuJP6JpzEMQcDHmh7hHLYGgob+nKe1YHFMaG4V59HQa89g==
+  dependencies:
+    repeat-string "^1.5.2"
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
+
+progress@2.0.3, progress@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
+property-expr@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4"
+  integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==
+
+proxy-from-env@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+puppeteer-core@19.4.0:
+  version "19.4.0"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.0.tgz#3f52945d8cfa20cf8721a7902afcd8a1a299b54d"
+  integrity sha512-gG/jxseleZStinBn86x8r7trjcE4jcjx1hIQWOpACQhquHYMuKnrWxkzg+EDn8sN3wUtF/Ry9mtJgjM49oUOFQ==
+  dependencies:
+    cross-fetch "3.1.5"
+    debug "4.3.4"
+    devtools-protocol "0.0.1068969"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.1"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    tar-fs "2.1.1"
+    unbzip2-stream "1.4.3"
+    ws "8.10.0"
+
+puppeteer@^19.4.0:
+  version "19.4.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.0.tgz#3adfcb415e96d7b5900a66a1097947272313ee9f"
+  integrity sha512-sRzWEfFSZCCcFUJflGtYI2V7A6qK4Jht+2JiI2LZgn+Nv/LOZZsBDEaGl98ZrS8oEcUA5on4p2yJbE0nzHNzIg==
+  dependencies:
+    cosmiconfig "8.0.0"
+    devtools-protocol "0.0.1068969"
+    https-proxy-agent "5.0.1"
+    progress "2.0.3"
+    proxy-from-env "1.1.0"
+    puppeteer-core "19.4.0"
+
+readable-stream@^3.1.1, readable-stream@^3.4.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+reflect-metadata@0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+
+regenerator-runtime@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
+regexp-match-indices@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regexp-match-indices/-/regexp-match-indices-1.0.2.tgz#cf20054a6f7d5b3e116a701a7b00f82889d10da6"
+  integrity sha512-DwZuAkt8NF5mKwGGER1EGh2PRqyvhRhhLviH+R8y8dIuaQROlUfXjt4s9ZTXstIsSkptf06BSvwcEmmfheJJWQ==
+  dependencies:
+    regexp-tree "^0.1.11"
+
+regexp-tree@^0.1.11:
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d"
+  integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==
+
+repeat-string@^1.5.2, repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-2.0.0.tgz#ac06991418a7623edc119084edc98b0e6bf05a41"
+  integrity sha512-+1lzwXehGCXSeryaISr6WujZzowloigEofRB+dj75y9RRa/obVcYgbHJd53tdYw8pvZj8GojXaaENws8Ktw/hQ==
+  dependencies:
+    resolve-from "^5.0.0"
+
+rimraf@3.0.2, rimraf@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+seed-random@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54"
+  integrity sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ==
+
+semver@7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
+source-map-support@0.5.21, source-map-support@^0.5.21:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+stackframe@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
+  integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
+
+string-argv@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+
+string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+strip-ansi@6.0.1, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
+tar-fs@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
+
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+thenify-all@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
+  integrity sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==
+  dependencies:
+    thenify ">= 3.1.0 < 4"
+
+"thenify@>= 3.1.0 < 4":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+  integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
+  dependencies:
+    any-promise "^1.0.0"
+
+through@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
+
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==
+
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
+ts-node@^10.9.1:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+  dependencies:
+    "@cspotcode/source-map-support" "^0.8.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.1"
+    yn "3.1.1"
+
+tslib@^2.0.3:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
+
+unbzip2-stream@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
+  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
+
+upper-case-first@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324"
+  integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==
+  dependencies:
+    tslib "^2.0.3"
+
+util-arity@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/util-arity/-/util-arity-1.1.0.tgz#59d01af1fdb3fede0ac4e632b0ab5f6ce97c9330"
+  integrity sha512-kkyIsXKwemfSy8ZEoaIz06ApApnWsk5hQO0vLjZS6UkBiGiW++Jsyb8vSBoc0WKlffGoGs5yYy/j5pp8zckrFA==
+
+util-deprecate@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
+
+uuid@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
+
+v8-compile-cache-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
+
+verror@^1.10.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb"
+  integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+ws@8.10.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51"
+  integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==
+
+xmlbuilder@^15.1.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
+  integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yauzl@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
+  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
+  dependencies:
+    buffer-crc32 "~0.2.3"
+    fd-slicer "~1.1.0"
+
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+yup@^0.32.11:
+  version "0.32.11"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"
+  integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==
+  dependencies:
+    "@babel/runtime" "^7.15.4"
+    "@types/lodash" "^4.14.175"
+    lodash "^4.17.21"
+    lodash-es "^4.17.21"
+    nanoclone "^0.2.1"
+    property-expr "^2.0.4"
+    toposort "^2.0.2"
diff --git a/jest.config.ts b/jest.config.ts
index 10d4628a23..042f87ab09 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -3,7 +3,7 @@
  * https://jestjs.io/docs/en/configuration.html
  */
 
-export default {
+const config = {
   coverageProvider: 'v8',
   moduleNameMapper: {
     '^lib/(.*)$': '<rootDir>/src/lib/$1'
@@ -17,3 +17,5 @@ export default {
   setupFiles: ['dotenv/config', '@serh11p/jest-webextension-mock'],
   setupFilesAfterEnv: ['./jest.setup.js']
 };
+
+export default config;
diff --git a/package.json b/package.json
index 2820e539ae..e9406d31d1 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,13 @@
 {
   "name": "temple-wallet",
-  "version": "1.15.5",
+  "version": "1.16.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development webpack --watch --stats errors-warnings",
+    "start-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack --watch --stats errors-warnings",
+    "start": "cross-env NODE_ENV=development run-s start-run",
     "start:firefox": "cross-env TARGET_BROWSER=firefox run-s start",
-    "build": "cross-env NODE_ENV=production webpack",
+    "build-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack && ts-node webpack/zip-script.ts",
+    "build": "cross-env NODE_ENV=production run-s build-run",
     "build-all": "run-s build:*",
     "build:chrome": "cross-env TARGET_BROWSER=chrome run-s build",
     "build:firefox": "cross-env TARGET_BROWSER=firefox run-s build",
@@ -53,6 +55,7 @@
     "@tezos-domains/taquito-client": "1.21.0",
     "@types/analytics-node": "3.1.9",
     "@types/async-retry": "1.4.3",
+    "@types/bs58check": "^2.1.0",
     "@types/debounce-promise": "3.1.4",
     "@types/elliptic": "6.4.14",
     "@types/fontfaceobserver": "0.0.6",
@@ -60,31 +63,33 @@
     "@types/ledgerhq__hw-transport": "4.21.3",
     "@types/ledgerhq__hw-transport-u2f": "4.21.2",
     "@types/libsodium-wrappers": "0.7.8",
-    "@types/node": "14.0.27",
+    "@types/node": "16.11.7",
     "@types/node-forge": "^1.3.0",
     "@types/react": "18.0.15",
     "@types/react-collapse": "5.0.1",
+    "@types/react-dev-utils": "^9.0.11",
     "@types/react-dom": "18.0.6",
     "@types/react-image-fallback": "^8.0.3",
     "@types/react-modal": "3.13.1",
     "@types/react-text-mask": "^5.4.11",
     "@types/react-transition-group": "4.4.5",
     "@types/react-virtualized": "^9.21.21",
+    "@types/resolve": "^1.20.2",
     "@types/scryptsy": "^2.0.0",
     "@types/typedarray-to-buffer": "^4.0.0",
     "@types/w3c-web-hid": "^1.0.3",
     "@types/webextension-polyfill": "^0.9.1",
-    "@typescript-eslint/eslint-plugin": "5.38.0",
-    "@typescript-eslint/parser": "5.38.0",
+    "@types/webpack": "^5.28.0",
+    "@types/ws": "^7.4.6",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
     "@vespaiach/axios-fetch-adapter": "^0.3.1",
     "analytics-node": "6.0.0",
     "assert": "1.5.0",
     "async-retry": "1.3.3",
     "autoprefixer": "10.4.2",
     "axios": "0.26.1",
-    "babel-eslint": "10.1.0",
     "babel-loader": "8.2.5",
-    "babel-preset-react-app": "10.0.1",
     "bignumber.js": "9.1.0",
     "bip39": "3.0.4",
     "bs58check": "2.1.2",
@@ -93,6 +98,7 @@
     "clsx": "1.1.1",
     "constate": "3.3.2",
     "copy-webpack-plugin": "11.0.0",
+    "create-file-webpack": "^1.0.2",
     "cross-env": "7.0.3",
     "crypto-browserify": "3.12.0",
     "css-loader": "6.7.1",
@@ -106,20 +112,16 @@
     "effector": "21.2.0",
     "eslint": "^8.17.0",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-import-resolver-typescript": "2.4.0",
-    "eslint-plugin-flowtype": "5.10.0",
+    "eslint-import-resolver-typescript": "^3",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "6.5.1",
-    "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-react": "^7.31.8",
-    "eslint-plugin-react-hooks": "4.6.0",
+    "eslint-plugin-prettier": "^4",
     "eslint-webpack-plugin": "^3.2.0",
     "fast-deep-equal": "3.1.3",
     "file-loader": "6.2.0",
     "fontfaceobserver": "2.1.0",
     "fuse.js": "6.4.6",
     "graphql": "^16.6.0",
-    "html-webpack-plugin": "5.5.0",
+    "html-webpack-plugin": "^5.5.0",
     "inter-ui": "3.13.1",
     "jest": "27.4.5",
     "libsodium": "0.7.8",
@@ -135,12 +137,12 @@
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-loader": "4.3.0",
     "postcss-preset-env": "7.3.3",
-    "prettier": "2.4.1",
+    "prettier": "^2.7.1",
     "process": "^0.11.10",
     "react": "18.2.0",
     "react-collapse": "5.1.1",
     "react-countdown": "2.3.2",
-    "react-dev-utils": "11.0.4",
+    "react-dev-utils": "^12",
     "react-dom": "18.2.0",
     "react-hook-form": "5.3.1",
     "react-image-fallback": "^8.0.0",
@@ -177,11 +179,13 @@
     "util": "0.11.1",
     "wasm-themis": "0.14.6",
     "webextension-polyfill": "^0.10.0",
-    "webpack": "5.74.0",
-    "webpack-cli": "4.10.0",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^5",
     "webpack-ext-reloader": "^1.1.9",
-    "webpackbar": "4.0.0",
-    "zip-webpack-plugin": "4.0.1"
+    "webpack-ext-reloader-mv3": "^2.1.1",
+    "webpack-target-webextension": "^1.0.4",
+    "webpackbar": "^5",
+    "zip-a-folder": "^1.1.5"
   },
   "resolutions": {
     "@taquito/**/braces": "2.3.1",
diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
index c834b35e9d..9ff61f4365 100644
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -115,6 +115,9 @@
   "skip": {
     "message": "Skip"
   },
+  "skipAd": {
+    "message": "SKIP AD"
+  },
   "checkNow": {
     "message": "Check now"
   },
diff --git a/public/manifest.json b/public/manifest.json
deleted file mode 100644
index d39f8869d9..0000000000
--- a/public/manifest.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "manifest_version": 2,
-  "name": "Temple - Tezos Wallet",
-  "version": "1.15.5",
-
-  "icons": {
-    "16": "misc/icon-16.png",
-    "19": "misc/icon-19.png",
-    "38": "misc/icon-38.png",
-    "128": "misc/icon-128.png"
-  },
-
-  "description": "__MSG_appDesc__",
-  "__chrome|firefox|opera__homepage_url": "https://github.com/madfish-solutions/templewallet-extension",
-  "short_name": "Temple - Tezos Wallet",
-
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "activeTab",
-    "http://localhost:8732/",
-    "https://*.giganode.io/",
-    "https://*.tzstats.com/",
-    "https://api.tezos-nodes.com/",
-    "https://api.better-call.dev/",
-    "https://*.tzkt.io/",
-    "https://api.baking-bad.org/v2/",
-    "https://quipuswap.com/"
-  ],
-  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
-
-  "__chrome|firefox__author": "https://madfish.solutions",
-  "__opera__developer": {
-    "name": "https://madfish.solutions"
-  },
-
-  "__firefox__applications": {
-    "gecko": { "id": "{34ac229e-1cf5-4e4c-8a77-988155c4360f}" }
-  },
-
-  "__chrome__minimum_chrome_version": "49",
-  "__opera__minimum_opera_version": "36",
-
-  "default_locale": "en",
-
-  "browser_action": {
-    "__chrome|firefox|opera__default_popup": "popup.html",
-    "default_icon": {
-      "16": "misc/icon-16.png",
-      "19": "misc/icon-19.png",
-      "38": "misc/icon-38.png",
-      "128": "misc/icon-128.png"
-    },
-    "default_title": "Temple - Tezos Wallet",
-    "__chrome|opera__chrome_style": false,
-    "__firefox__browser_style": false
-  },
-
-  "__chrome|opera__options_page": "options.html",
-
-  "options_ui": {
-    "page": "options.html",
-    "open_in_tab": true,
-    "__chrome__chrome_style": false
-  },
-
-  "background": {
-    "scripts": ["scripts/background.js"],
-    "__chrome|opera__persistent": true
-  },
-
-  "content_scripts": [
-    {
-      "matches": ["http://localhost/*", "http://127.0.0.1/*", "https://*/*"],
-      "js": ["scripts/contentScript.js"],
-      "run_at": "document_start",
-      "all_frames": true
-    }
-  ]
-}
diff --git a/public/misc/baker.svg b/public/misc/baker.svg
deleted file mode 100644
index 8b2dfb4e16..0000000000
--- a/public/misc/baker.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M64 128C99.3462 128 128 99.3462 128 64C128 28.6538 99.3462 0 64 0C28.6538 0 0 28.6538 0 64C0 99.3462 28.6538 128 64 128Z" fill="#A1A4B1"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M64 6.10352e-05C28.6538 6.10352e-05 0 28.6538 0 64.0001C0 99.3463 28.6538 128 64 128C99.3462 128 128 99.3463 128 64.0001C128 28.6538 99.3462 6.10352e-05 64 6.10352e-05ZM42.1048 62.1013C42.1048 64.3104 43.8957 66.1013 46.1048 66.1013H81.8951C84.1043 66.1013 85.8952 64.3104 85.8952 62.1013V59.2891C85.8952 57.4953 87.126 55.9786 88.7078 55.1326C91.9017 53.4243 94 50.5829 94 47.3696C94 42.0863 88.4355 37.8837 81.4194 37.8837C80.7974 37.8837 80.1917 37.9161 79.6024 37.9809C77.8482 38.1737 76.042 37.5745 74.7736 36.3475C72.0064 33.6706 68.2327 32 64 32C59.7673 32 55.9936 33.6706 53.2264 36.3475C51.958 37.5745 50.1518 38.1737 48.3976 37.9809C47.8083 37.9161 47.2026 37.8837 46.5806 37.8837C39.6855 37.8837 34 42.2064 34 47.3696C34.0951 50.674 36.1346 53.5329 39.2952 55.2461C40.8722 56.101 42.1048 57.6153 42.1048 59.4092V62.1013ZM41.6209 72.9456C41.6209 85.6735 51.5403 96 63.758 96C75.9758 96 85.8951 85.6735 85.8951 72.9456C85.8951 72.4653 85.8649 71.985 85.8346 71.5047C85.7846 70.7096 85.1284 70.0638 84.3317 70.0638H41.8629L41.8629 70.0638C41.7419 71.0244 41.6209 71.985 41.6209 72.9456Z" fill="#F0F1F3"/>
-</svg>
diff --git a/public/misc/exchangers-logos/quipuswap-logo.png b/public/misc/exchangers-logos/quipuswap-logo.png
deleted file mode 100644
index 1566d0b0394bf48d0a25a89f0ea1a2f67cb6d590..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/src/app/App.tsx b/src/app/App.tsx
index 12ff8e7eb3..9b165769d2 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -3,6 +3,9 @@ import React, { ComponentProps, FC, Suspense } from 'react';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
 
+import 'lib/lock-up/run-checks';
+import 'lib/ledger/proxy/foreground';
+
 import AwaitFonts from 'app/a11y/AwaitFonts';
 import AwaitI18N from 'app/a11y/AwaitI18N';
 import BootAnimation from 'app/a11y/BootAnimation';
diff --git a/src/app/PageRouter.tsx b/src/app/PageRouter.tsx
index af39553f5e..ca1c158953 100644
--- a/src/app/PageRouter.tsx
+++ b/src/app/PageRouter.tsx
@@ -18,7 +18,7 @@ import Send from 'app/pages/Send';
 import Settings from 'app/pages/Settings';
 import { Swap } from 'app/pages/Swap/Swap';
 import Unlock from 'app/pages/Unlock';
-import Welcome from 'app/pages/Welcome';
+import Welcome from 'app/pages/Welcome/Welcome';
 import { usePageRouterAnalytics } from 'lib/analytics';
 import { Notifications, NotificationsItem } from 'lib/notifications';
 import { useTempleClient } from 'lib/temple/front';
diff --git a/src/app/atoms/Button.tsx b/src/app/atoms/Button.tsx
index 03791661ac..fb765b6b44 100644
--- a/src/app/atoms/Button.tsx
+++ b/src/app/atoms/Button.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { AnalyticsEventCategory, TestIDProps, useAnalytics } from 'lib/analytics';
+import { AnalyticsEventCategory, setTestID, TestIDProps, useAnalytics } from 'lib/analytics';
 
 interface Props
   extends React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>,
@@ -15,7 +15,6 @@ export const Button = React.forwardRef<HTMLButtonElement, Props>(
 
       return onClick !== undefined && onClick(e);
     };
-
-    return <button ref={ref} onClick={handleClick} {...props} />;
+    return <button ref={ref} onClick={handleClick} {...props} {...setTestID(testID)} />;
   }
 );
diff --git a/src/app/atoms/Checkbox.tsx b/src/app/atoms/Checkbox.tsx
index 39c17e4e96..5fcee6a35d 100644
--- a/src/app/atoms/Checkbox.tsx
+++ b/src/app/atoms/Checkbox.tsx
@@ -3,15 +3,17 @@ import React, { forwardRef, InputHTMLAttributes, useCallback, useEffect, useStat
 import classNames from 'clsx';
 
 import { ReactComponent as OkIcon } from 'app/icons/ok.svg';
+import { setTestID, TestIDProps } from 'lib/analytics';
 import { blurHandler, checkedHandler, focusHandler } from 'lib/ui/inputHandlers';
 
-type CheckboxProps = InputHTMLAttributes<HTMLInputElement> & {
-  containerClassName?: string;
-  errored?: boolean;
-};
+type CheckboxProps = TestIDProps &
+  InputHTMLAttributes<HTMLInputElement> & {
+    containerClassName?: string;
+    errored?: boolean;
+  };
 
 const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
-  ({ containerClassName, errored = false, className, checked, onChange, onFocus, onBlur, ...rest }, ref) => {
+  ({ containerClassName, errored = false, className, checked, onChange, onFocus, onBlur, testID, ...rest }, ref) => {
     const [localChecked, setLocalChecked] = useState(() => checked ?? false);
 
     useEffect(() => {
@@ -75,6 +77,7 @@ const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>(
           onChange={handleChange}
           onFocus={handleFocus}
           onBlur={handleBlur}
+          {...setTestID(testID)}
           {...rest}
         />
 
diff --git a/src/app/atoms/FormCheckbox.tsx b/src/app/atoms/FormCheckbox.tsx
index 404ffed566..1e95870bf5 100644
--- a/src/app/atoms/FormCheckbox.tsx
+++ b/src/app/atoms/FormCheckbox.tsx
@@ -3,17 +3,19 @@ import React, { ComponentProps, forwardRef, ReactNode } from 'react';
 import classNames from 'clsx';
 
 import Checkbox from 'app/atoms/Checkbox';
+import { setTestID, TestIDProps } from 'lib/analytics';
 
-type FormCheckboxProps = ComponentProps<typeof Checkbox> & {
-  label?: ReactNode;
-  labelDescription?: ReactNode;
-  errorCaption?: ReactNode;
-  containerClassName?: string;
-  labelClassName?: string;
-};
+type FormCheckboxProps = TestIDProps &
+  ComponentProps<typeof Checkbox> & {
+    label?: ReactNode;
+    labelDescription?: ReactNode;
+    errorCaption?: ReactNode;
+    containerClassName?: string;
+    labelClassName?: string;
+  };
 
 export const FormCheckbox = forwardRef<HTMLInputElement, FormCheckboxProps>(
-  ({ label, labelDescription, errorCaption, containerClassName, labelClassName, ...rest }, ref) => (
+  ({ label, labelDescription, errorCaption, containerClassName, labelClassName, testID, ...rest }, ref) => (
     <div className={classNames('flex flex-col', containerClassName)}>
       <label
         className={classNames(
@@ -26,6 +28,7 @@ export const FormCheckbox = forwardRef<HTMLInputElement, FormCheckboxProps>(
           'flex items-center',
           labelClassName
         )}
+        {...setTestID(testID)}
       >
         <Checkbox ref={ref} errored={Boolean(errorCaption)} {...rest} />
 
diff --git a/src/app/atoms/FormField.tsx b/src/app/atoms/FormField.tsx
index 2a5eccd84a..673d8a54e7 100644
--- a/src/app/atoms/FormField.tsx
+++ b/src/app/atoms/FormField.tsx
@@ -16,6 +16,7 @@ import CleanButton from 'app/atoms/CleanButton';
 import CopyButton from 'app/atoms/CopyButton';
 import { ReactComponent as CopyIcon } from 'app/icons/copy.svg';
 import { ReactComponent as LockAltIcon } from 'app/icons/lock-alt.svg';
+import { setTestID, TestIDProps } from 'lib/analytics';
 import { T } from 'lib/i18n';
 import { blurHandler, checkedHandler, focusHandler } from 'lib/ui/inputHandlers';
 import useCopyToClipboard from 'lib/ui/useCopyToClipboard';
@@ -26,7 +27,7 @@ export const PASSWORD_ERROR_CAPTION = 'PASSWORD_ERROR_CAPTION';
 
 type FormFieldRef = HTMLInputElement | HTMLTextAreaElement;
 type FormFieldAttrs = InputHTMLAttributes<HTMLInputElement> & TextareaHTMLAttributes<HTMLTextAreaElement>;
-interface FormFieldProps extends FormFieldAttrs {
+interface FormFieldProps extends TestIDProps, FormFieldAttrs {
   extraSection?: ReactNode;
   label?: ReactNode;
   labelDescription?: ReactNode;
@@ -78,6 +79,7 @@ export const FormField = forwardRef<FormFieldRef, FormFieldProps>(
       fieldWrapperBottomMargin = true,
       labelPaddingClassName = 'mb-4',
       copyable,
+      testID,
       ...rest
     },
     ref
@@ -192,6 +194,7 @@ export const FormField = forwardRef<FormFieldRef, FormFieldProps>(
             onFocus={handleFocus}
             onBlur={handleBlur}
             {...rest}
+            {...setTestID(testID)}
           />
 
           {localValue !== '' && isPasswordInput && TogglePasswordIcon}
diff --git a/src/app/atoms/SeedPhraseInput.tsx b/src/app/atoms/SeedPhraseInput.tsx
index 7c16c93e0e..3a527f98bc 100644
--- a/src/app/atoms/SeedPhraseInput.tsx
+++ b/src/app/atoms/SeedPhraseInput.tsx
@@ -3,6 +3,7 @@ import React, { FC, useCallback, useMemo, useState } from 'react';
 import { validateMnemonic } from 'bip39';
 import classNames from 'clsx';
 
+import { TestIDProps } from 'lib/analytics';
 import { T, t } from 'lib/i18n';
 import { clearClipboard } from 'lib/ui/util';
 
@@ -11,7 +12,7 @@ import { useAppEnv } from '../env';
 import { SeedLengthSelect } from './SeedLengthSelect';
 import { SeedWordInput } from './SeedWordInput';
 
-interface SeedPhraseInputProps {
+interface SeedPhraseInputProps extends TestIDProps {
   isFirstAccount?: boolean;
   submitted: boolean;
   seedError: string;
@@ -32,7 +33,8 @@ export const SeedPhraseInput: FC<SeedPhraseInputProps> = ({
   labelWarning,
   onChange,
   setSeedError,
-  reset
+  reset,
+  testID
 }) => {
   const { popup } = useAppEnv();
 
@@ -179,6 +181,7 @@ export const SeedPhraseInput: FC<SeedPhraseInputProps> = ({
                 onSeedWordChange(index, e);
               }}
               value={draftSeed[index]}
+              testID={testID}
               onPaste={(e: React.ClipboardEvent<HTMLInputElement>) => {
                 const newSeed = e.clipboardData.getData('text');
 
diff --git a/src/app/atoms/SeedWordInput.tsx b/src/app/atoms/SeedWordInput.tsx
index 3b23b1360d..5284b90335 100644
--- a/src/app/atoms/SeedWordInput.tsx
+++ b/src/app/atoms/SeedWordInput.tsx
@@ -2,11 +2,12 @@ import React, { FC, useCallback, useEffect, useMemo, useRef, useState } from 're
 
 import classNames from 'clsx';
 
+import { setTestID, TestIDProps } from 'lib/analytics';
 import { T } from 'lib/i18n';
 
 import { ReactComponent as LockAltIcon } from '../icons/lock-alt.svg';
 
-interface SeedWordInputProps {
+interface SeedWordInputProps extends TestIDProps {
   id: number;
   submitted: boolean;
   showSeed: boolean;
@@ -29,7 +30,8 @@ export const SeedWordInput: FC<SeedWordInputProps> = ({
   setShowSeed,
   onChange,
   onPaste,
-  className
+  className,
+  testID
 }) => {
   const [focused, setFocused] = useState(false);
   const inputRef = useRef<HTMLInputElement>(null);
@@ -110,6 +112,7 @@ export const SeedWordInput: FC<SeedWordInputProps> = ({
           'text-center',
           className
         )}
+        {...setTestID(testID)}
       />
       {isWordHidden && (
         <div
diff --git a/src/app/pages/AddAsset.tsx b/src/app/pages/AddAsset.tsx
index fa4b8adb80..1bbc8ef215 100644
--- a/src/app/pages/AddAsset.tsx
+++ b/src/app/pages/AddAsset.tsx
@@ -382,16 +382,24 @@ const BottomSection: FC<BottomSectionProps> = props => {
         ref={register({
           validate: (val: string) => {
             if (!val) return true;
-            if (val.match(/(https:\/\/.*)/i) || val.match(/(ipfs:\/\/.*)/i)) {
+            if (val.match(/(https:\/\/.*)/i) || val.match(/(ipfs:\/\/.*)/i) || val.match(/(data:image\/.*)/i)) {
               return true;
             }
 
             return (
               <ul className="list-disc list-inside">
-                <T id="validImageURL">{message => <li>{message}</li>}</T>
-                <T id="onlyHTTPS">{message => <li>{message}</li>}</T>
-                <T id="formatsAllowed">{message => <li>{message}</li>}</T>
-                <T id="orIPFSImageURL">{message => <li>{message}</li>}</T>
+                <li>
+                  <T id="validImageURL" />
+                </li>
+                <li>
+                  <T id="onlyHTTPS" />
+                </li>
+                <li>
+                  <T id="formatsAllowed" />
+                </li>
+                <li>
+                  <T id="orIPFSImageURL" />
+                </li>
               </ul>
             );
           }
@@ -401,18 +409,22 @@ const BottomSection: FC<BottomSectionProps> = props => {
         label={
           <>
             <T id="iconURL" />{' '}
-            <T id="optionalComment">{message => <span className="text-sm font-light text-gray-600">{message}</span>}</T>
+            <span className="text-sm font-light text-gray-600">
+              <T id="optionalComment" />
+            </span>
           </>
         }
         labelDescription={t('iconURLInputDescription')}
         placeholder="e.g. https://cdn.com/mytoken.png"
-        errorCaption={errors.iconUrl?.message}
+        errorCaption={errors.thumbnailUri?.message}
         containerClassName="mb-6"
       />
 
       {submitError && <Alert type="error" title={t('error')} autoFocus description={submitError} className="mb-6" />}
 
-      <T id="addToken">{message => <FormSubmitButton loading={formState.isSubmitting}>{message}</FormSubmitButton>}</T>
+      <FormSubmitButton loading={formState.isSubmitting}>
+        <T id="addToken" />
+      </FormSubmitButton>
     </>
   );
 };
diff --git a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx b/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx
deleted file mode 100644
index b6411b165d..0000000000
--- a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { FC, useMemo, useState } from 'react';
-
-import browser from 'webextension-polyfill';
-
-interface Props {
-  currencyCode: string;
-  imageSrc: string;
-  style?: React.CSSProperties;
-}
-
-const EXOLIX_FALLBACK_IMAGE_SRC = 'https://exolix.com/img/crypto.png';
-
-export const StaticCurrencyImage: FC<Props> = ({ currencyCode, imageSrc, style = {} }) => {
-  const [isFailed, setIsFailed] = useState(false);
-
-  const conditionalStyle = useMemo(() => ({ display: isFailed ? 'none' : 'flex' }), [isFailed]);
-
-  return (
-    <>
-      <img
-        alt="currencyImage"
-        style={{ ...style, ...conditionalStyle }}
-        src={
-          currencyCode === 'TEZ' || currencyCode === 'XTZ'
-            ? browser.runtime.getURL('misc/token-logos/tez.svg')
-            : imageSrc
-        }
-        onLoad={() => setIsFailed(false)}
-        onError={() => setIsFailed(true)}
-      />
-      {isFailed && <img alt="fallbackCurrencyImage" style={style} src={EXOLIX_FALLBACK_IMAGE_SRC} />}
-    </>
-  );
-};
diff --git a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.props.ts b/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.props.ts
deleted file mode 100644
index 5ac46d6360..0000000000
--- a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.props.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ReactNode } from 'react';
-
-import { CurrencyInterface } from '../../exolix.interface';
-
-export interface TopUpInputProps {
-  currency: CurrencyInterface;
-  currenciesList: CurrencyInterface[];
-  label: ReactNode;
-  setCurrency: (value: CurrencyInterface) => void;
-  isCurrenciesLoading?: boolean;
-  isSearchable?: boolean;
-  amount?: number;
-  className?: string;
-  amountInputDisabled?: boolean;
-  readOnly?: boolean;
-  minAmount?: string;
-  maxAmount?: string;
-  isMinAmountError?: boolean;
-  isMaxAmountError?: boolean;
-  onAmountChange?: (value?: number) => void;
-}
diff --git a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInputHeader/TopUpInputHeader.tsx b/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInputHeader/TopUpInputHeader.tsx
deleted file mode 100644
index f1554f3e98..0000000000
--- a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInputHeader/TopUpInputHeader.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-import React, { ChangeEvent, forwardRef, FocusEvent, useEffect, useRef, useState } from 'react';
-
-import classNames from 'clsx';
-
-import AssetField from 'app/atoms/AssetField';
-import { ReactComponent as ChevronDownIcon } from 'app/icons/chevron-down.svg';
-import { ReactComponent as SearchIcon } from 'app/icons/search.svg';
-import { getBigErrorText, getSmallErrorText } from 'app/pages/Buy/utils/errorText.utils';
-import { emptyFn } from 'app/utils/function.utils';
-import { toLocalFormat, T, t } from 'lib/i18n';
-import { PopperRenderProps } from 'lib/ui/Popper';
-
-import { getProperNetworkFullName } from '../../../exolix.util';
-import { StaticCurrencyImage } from '../StaticCurrencyImage/StaticCurrencyImage';
-import { TopUpInputProps } from '../TopUpInput.props';
-
-interface Props extends PopperRenderProps, TopUpInputProps {
-  searchString: string;
-  onSearchChange: (e: ChangeEvent<HTMLInputElement>) => void;
-}
-
-export const TopUpInputHeader = forwardRef<HTMLDivElement, Props>(
-  (
-    {
-      currency,
-      amount,
-      label,
-      readOnly,
-      opened,
-      searchString,
-      toggleOpened,
-      amountInputDisabled,
-      minAmount,
-      maxAmount,
-      isMinAmountError,
-      isMaxAmountError,
-      isSearchable = false,
-      onAmountChange = emptyFn,
-      onSearchChange
-    },
-    ref
-  ) => {
-    const amountFieldRef = useRef<HTMLInputElement>(null);
-    const searchInputRef = useRef<HTMLInputElement>(null);
-    const prevOpenedRef = useRef(opened);
-
-    const [isActive, setIsActive] = useState(false);
-
-    const minAmountErrorClassName = getBigErrorText(isMinAmountError);
-
-    useEffect(() => {
-      if (!prevOpenedRef.current && opened) {
-        searchInputRef.current?.focus();
-      }
-      prevOpenedRef.current = opened;
-    }, [opened]);
-
-    const handleFocus = () => setIsActive(true);
-    const handleBlur = () => setIsActive(false);
-
-    const handleAmountFieldFocus = (event: FocusEvent<HTMLInputElement> | FocusEvent<HTMLTextAreaElement>) => {
-      event.preventDefault();
-      setIsActive(true);
-      amountFieldRef.current?.focus({ preventScroll: true });
-    };
-
-    const handleAmountChange = (newInputValue?: string) => {
-      const newValue = newInputValue ? Number(newInputValue) : undefined;
-      onAmountChange(newValue);
-    };
-
-    return (
-      <div className="w-full text-gray-700">
-        <div className="w-full flex mb-1 items-center justify-between">
-          <span className="text-xl text-gray-900">{label}</span>
-          {minAmount && !opened && (
-            <p className={getSmallErrorText(isMinAmountError)} style={{ marginBottom: -10 }}>
-              <T id="min" /> <span className={classNames(minAmountErrorClassName, 'text-sm')}>{' ' + minAmount}</span>{' '}
-              <span className={classNames(minAmountErrorClassName, 'text-xs')}>{currency.code}</span>
-            </p>
-          )}
-        </div>
-        <div
-          className={classNames(
-            isActive && 'border-orange-500 bg-gray-100',
-            'transition ease-in-out duration-200',
-            'w-full border rounded-md border-gray-300'
-          )}
-          ref={ref}
-        >
-          {isSearchable && (
-            <div className={classNames('w-full flex items-stretch', !opened && 'hidden')} style={{ height: '4.5rem' }}>
-              <div className="items-center ml-5 mr-3 my-6">
-                <SearchIcon className="w-6 h-auto text-gray-500 stroke-current stroke-2" />
-              </div>
-              <div className="text-lg flex flex-1 items-stretch">
-                <div className="flex-1 flex items-stretch mr-2">
-                  <input
-                    ref={searchInputRef}
-                    value={searchString}
-                    className="w-full px-2 bg-transparent"
-                    placeholder={t('swapTokenSearchInputPlaceholder')}
-                    onBlur={handleBlur}
-                    onFocus={handleFocus}
-                    onChange={onSearchChange}
-                  />
-                </div>
-              </div>
-            </div>
-          )}
-          <div
-            className={classNames('w-full flex items-stretch', opened && isSearchable && 'hidden')}
-            style={{ height: '4.5rem' }}
-          >
-            <div
-              className="border-r border-gray-300 pl-4 pr-3 flex py-5 items-center cursor-pointer"
-              onClick={toggleOpened}
-            >
-              <StaticCurrencyImage
-                currencyCode={currency.code}
-                imageSrc={currency.icon}
-                style={{
-                  borderRadius: '50%',
-                  width: 32,
-                  height: 32
-                }}
-              />
-              <div className="flex flex-col ml-2 text-left whitespace-nowrap">
-                <span className="text-gray-700 font-normal text-lg overflow-ellipsis overflow-hidden w-16">
-                  {currency.code}
-                </span>
-                <span
-                  className="text-indigo-500 font-medium overflow-ellipsis overflow-hidden w-12"
-                  style={{ fontSize: 11 }}
-                >
-                  {currency.networkShortName ?? getProperNetworkFullName(currency)}
-                </span>
-              </div>
-
-              <ChevronDownIcon className="w-4 ml-2 h-auto text-gray-700 stroke-current stroke-2" />
-            </div>
-            <div
-              className={classNames(
-                'flex-1 px-2 flex items-center justify-between',
-                amountInputDisabled && 'bg-gray-100'
-              )}
-            >
-              <div className="h-full flex-1 flex items-end justify-center flex-col">
-                <AssetField
-                  ref={amountFieldRef}
-                  value={amount?.toString()}
-                  readOnly={readOnly}
-                  className={classNames(
-                    'appearance-none',
-                    'w-full',
-                    'py-3',
-                    'border-2',
-                    'border-gray-300',
-                    'focus:border-primary-orange',
-                    'bg-gray-100 focus:bg-transparent',
-                    'focus:outline-none focus:shadow-outline',
-                    'transition ease-in-out duration-200',
-                    'rounded-md leading-tight placeholder-alphagray',
-                    'text-gray-700 text-2xl text-right border-none bg-opacity-0',
-                    'pl-0 focus:shadow-none'
-                  )}
-                  style={{ padding: 0, borderRadius: 0 }}
-                  placeholder={toLocalFormat(0, { decimalPlaces: 2 })}
-                  type="text"
-                  min={0}
-                  maxLength={15}
-                  disabled={amountInputDisabled}
-                  fieldWrapperBottomMargin={false}
-                  onBlur={handleBlur}
-                  onFocus={handleAmountFieldFocus}
-                  onChange={handleAmountChange}
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-        {maxAmount && !opened && (
-          <MaxAmountErrorComponent isMaxAmountError={isMaxAmountError} maxAmount={maxAmount} coin={currency.code} />
-        )}
-      </div>
-    );
-  }
-);
-
-interface MaxAmountErrorComponentProps {
-  isMaxAmountError?: boolean;
-  maxAmount?: string;
-  coin: string;
-}
-
-const MaxAmountErrorComponent: React.FC<MaxAmountErrorComponentProps> = ({ isMaxAmountError, maxAmount, coin }) => (
-  <div className="flex justify-end items-baseline mt-1">
-    <p className={getSmallErrorText(isMaxAmountError)}>
-      <CurrencyText className={getBigErrorText(isMaxAmountError)} coin={coin} maxAmount={maxAmount} />
-    </p>
-  </div>
-);
-
-const CurrencyText: React.FC<
-  Omit<MaxAmountErrorComponentProps, 'isCoinFromType' | 'isMaxAmountError'> & { className: string }
-> = ({ className, coin, maxAmount }) => (
-  <>
-    <T id={'max'} />
-    {':'}
-    <span className={classNames(className, 'text-sm')}> {maxAmount !== 'Infinity' ? maxAmount : '0'}</span>{' '}
-    <span className={classNames(className, 'text-xs')}>{coin}</span>
-  </>
-);
diff --git a/src/app/pages/Buy/Crypto/Exolix/config.ts b/src/app/pages/Buy/Crypto/Exolix/config.ts
index 15a5745042..4a235f1706 100644
--- a/src/app/pages/Buy/Crypto/Exolix/config.ts
+++ b/src/app/pages/Buy/Crypto/Exolix/config.ts
@@ -11,17 +11,21 @@ export const outputTokensList: OutputCurrencyInterface[] = [
     code: 'XTZ',
     name: 'Tezos',
     icon: 'https://exolix.com/icons/coins/XTZ.png',
-    network: 'XTZ',
-    networkFullName: 'Tezos',
+    network: {
+      code: 'XTZ',
+      fullName: 'Tezos'
+    },
     slug: 'tez'
   },
   {
     code: 'USDT',
     icon: 'https://exolix.com/icons/coins/USDT.png',
     name: 'TetherUS',
-    network: 'XTZ',
-    networkFullName: 'Tezos Mainnet',
-    networkShortName: 'Tezos',
+    network: {
+      code: 'XTZ',
+      fullName: 'Tezos Mainnet',
+      shortName: 'Tezos'
+    },
     slug: 'KT1XnTn74bUtxHfDtBmm2bGZAQfhPbvKWR8o_0'
   }
 ];
diff --git a/src/app/pages/Buy/Crypto/Exolix/exolix.interface.ts b/src/app/pages/Buy/Crypto/Exolix/exolix.interface.ts
index 9a4fc9a615..d97cf02c09 100644
--- a/src/app/pages/Buy/Crypto/Exolix/exolix.interface.ts
+++ b/src/app/pages/Buy/Crypto/Exolix/exolix.interface.ts
@@ -1,3 +1,5 @@
+import { CurrencyToken } from 'app/templates/TopUpInput';
+
 interface ExchangeCoin {
   coinCode: string;
   coinName: string;
@@ -63,16 +65,7 @@ export interface GetRateResponseWithAmountTooLow {
   message: string;
 }
 
-export interface CurrencyInterface {
-  name: string;
-  code: string;
-  network: string;
-  networkFullName: string;
-  icon: string;
-  networkShortName?: string | null;
-}
-
-export interface OutputCurrencyInterface extends CurrencyInterface {
+export interface OutputCurrencyInterface extends CurrencyToken {
   slug?: string;
 }
 
diff --git a/src/app/pages/Buy/Crypto/Exolix/exolix.util.ts b/src/app/pages/Buy/Crypto/Exolix/exolix.util.ts
index 602ad0a277..4463ce24ca 100644
--- a/src/app/pages/Buy/Crypto/Exolix/exolix.util.ts
+++ b/src/app/pages/Buy/Crypto/Exolix/exolix.util.ts
@@ -1,9 +1,9 @@
 import axios from 'axios';
 
 import { outputTokensList } from 'app/pages/Buy/Crypto/Exolix/config';
+import { CurrencyToken } from 'app/templates/TopUpInput';
 
 import {
-  CurrencyInterface,
   ExchangeDataInterface,
   ExolixCurrenciesInterface,
   GetRateRequestData,
@@ -41,15 +41,18 @@ export const getCurrencies = async () => {
         code,
         icon,
         name,
-        network: network.network,
-        networkFullName: network.name,
-        networkShortName: network.shortName === '' ? null : network.shortName
+        network: {
+          code: network.network,
+          fullName: network.name,
+          shortName: network.shortName === '' ? null : network.shortName
+        }
       }))
     )
     .flat()
     .filter(
       ({ name, network }) =>
-        outputTokensList.find(outputToken => outputToken.name === name && outputToken.network === network) === undefined
+        outputTokensList.find(outputToken => outputToken.name === name && outputToken.network.code === network.code) ===
+        undefined
     );
 };
 
@@ -86,9 +89,10 @@ export const submitExchange = (data: {
 export const getExchangeData = (exchangeId: string) =>
   api.get<ExchangeDataInterface>(`/transactions/${exchangeId}`).then(r => r.data);
 
-export const getProperNetworkFullName = (currency?: CurrencyInterface) =>
-  currency
-    ? currency.name === currency.networkFullName
-      ? currency.networkFullName + ' Mainnet'
-      : currency.networkFullName
-    : '';
+export const getProperNetworkFullName = (currency?: CurrencyToken) => {
+  if (currency == null) return '';
+
+  const { fullName: networkFullName } = currency.network!;
+
+  return currency.name === networkFullName ? networkFullName + ' Mainnet' : networkFullName;
+};
diff --git a/src/app/pages/Buy/Crypto/Exolix/steps/InitialStep.tsx b/src/app/pages/Buy/Crypto/Exolix/steps/InitialStep.tsx
index 14819fa892..be5d606d54 100644
--- a/src/app/pages/Buy/Crypto/Exolix/steps/InitialStep.tsx
+++ b/src/app/pages/Buy/Crypto/Exolix/steps/InitialStep.tsx
@@ -9,13 +9,13 @@ import Divider from 'app/atoms/Divider';
 import styles from 'app/pages/Buy/Crypto/Exolix/Exolix.module.css';
 import ErrorComponent from 'app/pages/Buy/Crypto/Exolix/steps/ErrorComponent';
 import WarningComponent from 'app/pages/Buy/Crypto/Exolix/steps/WarningComponent';
+import { TopUpInput } from 'app/templates/TopUpInput';
 import { useAssetUSDPrice } from 'lib/fiat-currency';
 import { T } from 'lib/i18n';
 import { useAccount } from 'lib/temple/front';
 
-import { TopUpInput } from '../components/TopUpInput/TopUpInput';
 import { EXOLIX_PRIVICY_LINK, EXOLIX_TERMS_LINK, outputTokensList } from '../config';
-import { ExchangeDataInterface, ExchangeDataStatusEnum } from '../exolix.interface';
+import { ExchangeDataInterface, ExchangeDataStatusEnum, OutputCurrencyInterface } from '../exolix.interface';
 import { ExolixSelectors } from '../Exolix.selectors';
 import { getCurrencies, queryExchange, submitExchange } from '../exolix.util';
 import { useCurrenciesCount } from '../hooks/useCurrenciesCount.hook';
@@ -24,8 +24,10 @@ const INITIAL_COIN_FROM = {
   code: 'BTC',
   name: 'Bitcoin',
   icon: 'https://exolix.com/icons/coins/BTC.png',
-  network: 'BTC',
-  networkFullName: 'Bitcoin'
+  network: {
+    code: 'BTC',
+    fullName: 'Bitcoin'
+  }
 };
 const MAX_DOLLAR_VALUE = 10_000;
 const AVERAGE_COMMISSION = 300;
@@ -42,8 +44,8 @@ interface Props {
 const InitialStep: FC<Props> = ({ exchangeData, setExchangeData, setStep, isError, setIsError }) => {
   const { publicKeyHash } = useAccount();
 
-  const [coinFrom, setCoinFrom] = useState(INITIAL_COIN_FROM);
-  const [coinTo, setCoinTo] = useState(outputTokensList[0]!);
+  const [coinFrom, setCoinFrom] = useState<OutputCurrencyInterface>(INITIAL_COIN_FROM);
+  const [coinTo, setCoinTo] = useState<OutputCurrencyInterface>(outputTokensList[0]!);
 
   const [amount, setAmount] = useState<number | undefined>();
   const [maxAmountFetched, setMaxAmountFetched] = useState<number | nullish>();
@@ -60,9 +62,9 @@ const InitialStep: FC<Props> = ({ exchangeData, setExchangeData, setStep, isErro
     try {
       const data = await submitExchange({
         coinFrom: coinFrom.code,
-        networkFrom: coinFrom.network,
+        networkFrom: coinFrom.network.code,
         coinTo: coinTo.code,
-        networkTo: coinTo.network,
+        networkTo: coinTo.network.code,
         amount: amount ?? 0,
         withdrawalAddress: publicKeyHash,
         withdrawalExtraId: ''
@@ -83,10 +85,10 @@ const InitialStep: FC<Props> = ({ exchangeData, setExchangeData, setStep, isErro
   const { data: ratesData } = useSWR(['exolix/api/rate', coinFrom, coinTo, amount], () =>
     queryExchange({
       coinFrom: coinFrom.code,
-      coinFromNetwork: coinFrom.network,
+      coinFromNetwork: coinFrom.network!.code,
       amount: amount ?? 0,
       coinTo: coinTo.code,
-      coinToNetwork: coinTo.network
+      coinToNetwork: coinTo!.network.code
     })
   );
 
@@ -101,10 +103,10 @@ const InitialStep: FC<Props> = ({ exchangeData, setExchangeData, setStep, isErro
 
       const { toAmount: maxCoinFromAmount } = await queryExchange({
         coinFrom: coinTo.code,
-        coinFromNetwork: coinTo.network,
+        coinFromNetwork: coinTo.network!.code,
         amount: maxCoinToAmount,
         coinTo: coinFrom.code,
-        coinToNetwork: coinFrom.network
+        coinToNetwork: coinFrom.network!.code
       });
 
       setMaxAmountFetched(maxCoinFromAmount);
@@ -161,7 +163,7 @@ const InitialStep: FC<Props> = ({ exchangeData, setExchangeData, setStep, isErro
         currenciesList={currencies ?? []}
         isCurrenciesLoading={isCurrenciesLoading}
         label={<T id="send" />}
-        setCurrency={setCoinFrom}
+        onCurrencySelect={setCoinFrom}
         onAmountChange={setAmount}
         minAmount={minAmountString}
         maxAmount={maxAmountString}
@@ -179,7 +181,7 @@ const InitialStep: FC<Props> = ({ exchangeData, setExchangeData, setStep, isErro
         readOnly={true}
         amountInputDisabled={true}
         amount={toAmount}
-        setCurrency={setCoinTo}
+        onCurrencySelect={setCoinTo}
       />
 
       <Divider style={{ marginTop: '40px', marginBottom: '20px' }} />
diff --git a/src/app/pages/Buy/Crypto/Exolix/steps/WarningComponent.tsx b/src/app/pages/Buy/Crypto/Exolix/steps/WarningComponent.tsx
index 60786b4025..7bdf33c943 100644
--- a/src/app/pages/Buy/Crypto/Exolix/steps/WarningComponent.tsx
+++ b/src/app/pages/Buy/Crypto/Exolix/steps/WarningComponent.tsx
@@ -2,14 +2,14 @@ import React, { FC } from 'react';
 
 import classNames from 'clsx';
 
+import { CurrencyToken } from 'app/templates/TopUpInput';
 import { T } from 'lib/i18n';
 
 import { EXOLIX_CONTACT_LINK } from '../config';
-import { CurrencyInterface } from '../exolix.interface';
 import { getProperNetworkFullName } from '../exolix.util';
 
 interface Props {
-  currency?: CurrencyInterface;
+  currency?: CurrencyToken;
   amountAttention?: boolean;
 }
 
diff --git a/src/app/pages/Buy/Debit/AliceBob/AliceBobTopUp.tsx b/src/app/pages/Buy/Debit/AliceBob/AliceBobTopUp.tsx
index 65ee9047e6..f4705b0089 100644
--- a/src/app/pages/Buy/Debit/AliceBob/AliceBobTopUp.tsx
+++ b/src/app/pages/Buy/Debit/AliceBob/AliceBobTopUp.tsx
@@ -9,14 +9,15 @@ import { useMinMaxExchangeAmounts } from 'app/hooks/AliceBob/useMinMaxExchangeAm
 import { useOutputEstimation } from 'app/hooks/AliceBob/useOutputEstimation';
 import { ReactComponent as AttentionRedIcon } from 'app/icons/attentionRed.svg';
 import PageLayout from 'app/layouts/PageLayout';
+import { TopUpInput } from 'app/templates/TopUpInput';
 import { useAnalyticsState } from 'lib/analytics/use-analytics-state.hook';
 import { createAliceBobOrder } from 'lib/apis/temple';
 import { T } from 'lib/i18n/react';
+import { FIAT_ICONS_SRC } from 'lib/icons';
 import { useAccount } from 'lib/temple/front';
 
 import { BuySelectors } from '../../Buy.selectors';
 import styles from '../../Crypto/Exolix/Exolix.module.css';
-import { TopUpInput } from '../Utorg/components/TopUpInput/TopUpInput';
 import { ALICE_BOB_PRIVACY_LINK, ALICE_BOB_TERMS_LINK } from './config';
 
 const REQUEST_LATENCY = 500;
@@ -42,7 +43,7 @@ export const AliceBobTopUp: FC = () => {
   const outputAmount = useOutputEstimation(inputAmount, isMinAmountError, isMaxAmountError, setLoading, setIsApiError);
 
   const exchangeRate = useMemo(
-    () => (inputAmount && inputAmount > 0 ? (outputAmount / inputAmount).toFixed(4) : 0),
+    () => (inputAmount && outputAmount > 0 ? (inputAmount / outputAmount).toFixed(4) : 0),
     [inputAmount, outputAmount]
   );
 
@@ -85,14 +86,13 @@ export const AliceBobTopUp: FC = () => {
           </h3>
         </div>
       )}
+
       <div className="max-w-sm mx-auto mt-4 mb-10 text-center font-inter font-normal text-gray-700">
         <TopUpInput
-          singleToken
-          isDefaultUahIcon
           amountInputDisabled={isMinMaxLoading}
           label={<T id="send" />}
           amount={inputAmount}
-          currencyName="UAH"
+          currency={{ code: 'UAH', icon: FIAT_ICONS_SRC.UAH }}
           currenciesList={[]}
           minAmount={minExchangeAmount.toString()}
           maxAmount={maxExchangeAmount.toString()}
@@ -103,23 +103,24 @@ export const AliceBobTopUp: FC = () => {
         />
 
         <br />
+
         <TopUpInput
           readOnly
-          singleToken
-          isDefaultUahIcon
           amountInputDisabled
           label={<T id="get" />}
-          currencyName="TEZ"
+          currency={{ code: 'TEZ' }}
           currenciesList={[]}
           amount={outputAmount}
         />
         <Divider style={{ marginTop: '40px', marginBottom: '20px' }} />
+
         <div className={styles['exchangeRateBlock']}>
           <p className={styles['exchangeTitle']}>
             <T id={'exchangeRate'} />
           </p>
           <p className={styles['exchangeData']}>1 TEZ ≈ {exchangeRate} UAH</p>
         </div>
+
         <FormSubmitButton
           className="w-full justify-center border-none mt-6"
           style={{
@@ -143,6 +144,7 @@ export const AliceBobTopUp: FC = () => {
             <T id="next" />
           </a>
         </FormSubmitButton>
+
         <div className="border-solid border-gray-300" style={{ borderTopWidth: 1 }}>
           <p className="mt-6">
             <T
@@ -158,6 +160,7 @@ export const AliceBobTopUp: FC = () => {
               ]}
             />
           </p>
+
           <p className="mt-6">
             <T id="warningTopUpServiceMessage" />
           </p>
diff --git a/src/app/pages/Buy/Debit/Utorg/Utorg.tsx b/src/app/pages/Buy/Debit/Utorg/Utorg.tsx
index b634a3adf8..8c49232311 100644
--- a/src/app/pages/Buy/Debit/Utorg/Utorg.tsx
+++ b/src/app/pages/Buy/Debit/Utorg/Utorg.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useDebouncedCallback } from 'use-debounce';
 
@@ -6,63 +6,68 @@ import { FormSubmitButton } from 'app/atoms';
 import Divider from 'app/atoms/Divider';
 import { ReactComponent as AttentionRedIcon } from 'app/icons/attentionRed.svg';
 import PageLayout from 'app/layouts/PageLayout';
+import { TopUpInput } from 'app/templates/TopUpInput';
+import { CurrencyFiat } from 'app/templates/TopUpInput/types';
 import { createOrder } from 'lib/apis/utorg';
 import { T } from 'lib/i18n';
 import { useAccount } from 'lib/temple/front';
 
 import { BuySelectors } from '../../Buy.selectors';
 import styles from '../../Crypto/Exolix/Exolix.module.css';
-import { TopUpInput } from './components/TopUpInput/TopUpInput';
-import { UTORG_PRIVICY_LINK, UTORG_TERMS_LINK } from './config';
 import { useDisabledProceed } from './hooks/useDisabledProceed';
 import { useExchangeRate } from './hooks/useExchangeRate';
 import { useOutputAmount } from './hooks/useOutputAmount';
 import { useUpdatedExchangeInfo } from './hooks/useUpdatedExchangeInfo';
+import { UTORG_PRIVICY_LINK, UTORG_TERMS_LINK, buildIconSrc } from './utils';
 
 const DEFAULT_CURRENCY = 'USD';
 const REQUEST_LATENCY = 300;
 
 export const Utorg = () => {
-  const [inputCurrency, setInputCurrency] = useState(DEFAULT_CURRENCY);
-  const [inputAmount, setInputAmount] = useState<number | undefined>(undefined);
+  const [inputCurrencyCode, setInputCurrencyCode] = useState(DEFAULT_CURRENCY);
+  const [inputAmount, setInputAmount] = useState<number | undefined>();
 
   const [link, setLink] = useState('');
 
   const [isApiError, setIsApiError] = useState(false);
-  const [isLoading, setLoading] = useState(false);
+  const [isOrderLinkLoading, setOrderLinkLoading] = useState(false);
 
   const { publicKeyHash } = useAccount();
 
-  const exchangeRate = useExchangeRate(inputAmount, inputCurrency, setLoading);
-  const outputAmount = useOutputAmount(inputAmount, inputCurrency, setLoading);
+  const { isOutputLoading, outputAmount } = useOutputAmount(inputAmount, inputCurrencyCode);
 
-  const { currencies, minXtzExchangeAmount, maxXtzExchangeAmount, isMinMaxLoading } = useUpdatedExchangeInfo(
-    setLoading,
+  const { isCurrenciesLoading, currencies, minAmount, maxAmount, isMinMaxLoading } = useUpdatedExchangeInfo(
+    inputCurrencyCode,
     setIsApiError
   );
 
+  const { isRateLoading, exchangeRate } = useExchangeRate(inputAmount, minAmount, inputCurrencyCode);
+
   const { isMinAmountError, isMaxAmountError, disabledProceed } = useDisabledProceed(
     inputAmount,
-    outputAmount,
-    minXtzExchangeAmount,
-    maxXtzExchangeAmount,
+    minAmount,
+    maxAmount,
     isApiError
   );
 
+  const inputCurrency: CurrencyFiat = useMemo(
+    () => ({ code: inputCurrencyCode, icon: buildIconSrc(inputCurrencyCode) }),
+    [inputCurrencyCode]
+  );
+
   const linkRequest = useCallback(() => {
-    if (!disabledProceed) {
-      setLoading(true);
-      createOrder(outputAmount, inputCurrency, publicKeyHash)
-        .then(url => setLink(url))
-        .finally(() => setLoading(false));
-    }
-  }, [outputAmount, disabledProceed, inputCurrency, publicKeyHash]);
+    if (disabledProceed) return;
+    setOrderLinkLoading(true);
+    createOrder(outputAmount, inputCurrencyCode, publicKeyHash)
+      .then(setLink)
+      .finally(() => setOrderLinkLoading(false));
+  }, [outputAmount, disabledProceed, inputCurrencyCode, publicKeyHash]);
 
   const debouncedLinkRequest = useDebouncedCallback(linkRequest, REQUEST_LATENCY);
 
-  useEffect(() => debouncedLinkRequest(), [debouncedLinkRequest, inputAmount, inputCurrency]);
+  useEffect(() => debouncedLinkRequest(), [debouncedLinkRequest, inputAmount, inputCurrencyCode]);
 
-  const handleInputAmountChange = useCallback((amount?: number) => setInputAmount(amount), []);
+  const isLoading = isOutputLoading || isRateLoading || isOrderLinkLoading || isCurrenciesLoading;
 
   return (
     <PageLayout
@@ -80,42 +85,47 @@ export const Utorg = () => {
           </h3>
         </div>
       )}
+
       <div className="max-w-sm mx-auto mt-4 mb-10 text-center font-inter font-normal text-gray-700">
         <TopUpInput
           isSearchable
           label={<T id="send" />}
           amount={inputAmount}
-          currencyName={inputCurrency}
+          currency={inputCurrency}
           currenciesList={currencies}
-          setCurrencyName={setInputCurrency}
-          onAmountChange={handleInputAmountChange}
+          minAmount={String(minAmount)}
+          maxAmount={String(maxAmount || '---')}
+          isMinAmountError={isMinAmountError}
+          isMaxAmountError={isMaxAmountError}
+          onCurrencySelect={currency => setInputCurrencyCode(currency.code)}
+          onAmountChange={setInputAmount}
           amountInputDisabled={isMinMaxLoading}
+          fitIcons={true}
           className="mb-4"
         />
 
         <br />
+
         <TopUpInput
           readOnly
-          singleToken
           amountInputDisabled
           label={<T id="get" />}
-          currencyName="TEZ"
+          currency={{ code: 'TEZ' }}
           currenciesList={[]}
-          minAmount={minXtzExchangeAmount.toString()}
-          maxAmount={maxXtzExchangeAmount.toString()}
-          isMinAmountError={isMinAmountError}
-          isMaxAmountError={isMaxAmountError}
           amount={outputAmount}
         />
+
         <Divider style={{ marginTop: '40px', marginBottom: '20px' }} />
+
         <div className={styles['exchangeRateBlock']}>
           <p className={styles['exchangeTitle']}>
             <T id={'exchangeRate'} />
           </p>
           <p className={styles['exchangeData']}>
-            1 {inputCurrency} ≈ {exchangeRate} TEZ
+            1 TEZ ≈ {exchangeRate} {inputCurrencyCode}
           </p>
         </div>
+
         <FormSubmitButton
           className="w-full justify-center border-none mt-6"
           style={{
@@ -139,6 +149,7 @@ export const Utorg = () => {
             <T id="next" />
           </a>
         </FormSubmitButton>
+
         <div className="border-solid border-gray-300" style={{ borderTopWidth: 1 }}>
           <p className="mt-6">
             <T
diff --git a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx b/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx
deleted file mode 100644
index be5d484580..0000000000
--- a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React, { FC } from 'react';
-
-import { List } from 'react-virtualized';
-
-import DropdownWrapper from 'app/atoms/DropdownWrapper';
-import Spinner from 'app/atoms/Spinner/Spinner';
-import { useAppEnvStyle } from 'app/hooks/use-app-env-style.hook';
-import { T } from 'lib/i18n';
-
-import { CurrencyOption } from './CurrencyOption/CurrencyOption';
-
-interface Props {
-  value: string;
-  options: string[];
-  isLoading?: boolean;
-  opened: boolean;
-  setOpened: (newValue: boolean) => void;
-  onChange: (newValue: string) => void;
-}
-
-export const CurrenciesMenu: FC<Props> = ({ value, options, isLoading = false, opened, setOpened, onChange }) => {
-  const { dropdownWidth } = useAppEnvStyle();
-
-  const handleOptionClick = (newValue: string) => {
-    if (value !== newValue) {
-      onChange(newValue);
-    }
-    setOpened(false);
-  };
-
-  return (
-    <DropdownWrapper
-      opened={opened}
-      className="origin-top overflow-x-hidden overflow-y-auto"
-      style={{
-        maxHeight: options.length > 2 ? '15.75rem' : '8.25rem',
-        backgroundColor: 'white',
-        borderColor: '#e2e8f0',
-        padding: 0
-      }}
-    >
-      {(options.length === 0 || isLoading) && (
-        <div className="my-8 flex flex-col items-center justify-center text-gray-500">
-          {isLoading ? (
-            <Spinner theme="primary" style={{ width: '3rem' }} />
-          ) : (
-            <p className="flex items-center justify-center text-gray-600 text-base font-light">
-              <T id="noAssetsFound" />
-            </p>
-          )}
-        </div>
-      )}
-      <List
-        width={dropdownWidth}
-        height={options.length > 2 ? 240 : 132}
-        rowCount={options.length}
-        rowHeight={65}
-        rowRenderer={({ key, index, style }) => (
-          <CurrencyOption
-            key={key}
-            currencyName={options[index]}
-            isSelected={value === options[index]}
-            style={style}
-            onClick={handleOptionClick}
-          />
-        )}
-      />
-    </DropdownWrapper>
-  );
-};
diff --git a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrencyOption/CurrencyOption.tsx b/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrencyOption/CurrencyOption.tsx
deleted file mode 100644
index b04f1446d4..0000000000
--- a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/CurrenciesMenu/CurrencyOption/CurrencyOption.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React, { FC } from 'react';
-
-import classNames from 'clsx';
-import { ListRowProps } from 'react-virtualized';
-
-import { StaticCurrencyImage } from '../../StaticCurrencyImage/StaticCurrencyImage';
-
-interface Props extends Partial<Pick<ListRowProps, 'style'>> {
-  currencyName: string;
-  isSelected: boolean;
-  onClick: (newValue: string) => void;
-}
-
-export const CurrencyOption: FC<Props> = ({ currencyName, isSelected, style, onClick }) => (
-  <button
-    type="button"
-    style={style}
-    className={classNames('p-4 w-full flex items-center', isSelected && 'bg-gray-200')}
-    onClick={() => onClick(currencyName)}
-  >
-    <StaticCurrencyImage
-      currencyName={currencyName}
-      style={{
-        borderRadius: '50%',
-        width: 32,
-        height: 32
-      }}
-    />
-    <div className="flex flex-col ml-2 text-left">
-      <div className="flex items-center">
-        <span className="text-gray-700 mr-2 font-medium" style={{ fontSize: 17 }}>
-          {currencyName}
-        </span>
-      </div>
-    </div>
-  </button>
-);
diff --git a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx b/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx
deleted file mode 100644
index f06cb80947..0000000000
--- a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/StaticCurrencyImage/StaticCurrencyImage.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, { FC, useMemo, useState } from 'react';
-
-import browser from 'webextension-polyfill';
-
-const UTORG_FIAT_ICONS_BASE_URL = 'https://utorg.pro/img/flags2/icon-';
-
-interface Props {
-  currencyName: string;
-  isDefaultUahIcon?: boolean;
-  style?: React.CSSProperties;
-}
-
-export const StaticCurrencyImage: FC<Props> = ({ currencyName, isDefaultUahIcon, style = {} }) => {
-  const [isFailed, setIsFailed] = useState(false);
-  const conditionalStyle = useMemo(() => ({ display: isFailed ? 'none' : 'flex' }), [isFailed]);
-
-  return (
-    <>
-      {currencyName === 'TEZ' || currencyName === 'XTZ' ? (
-        <img alt="tezIcon" style={style} src={browser.runtime.getURL('misc/token-logos/tez.svg')} />
-      ) : currencyName === 'UAH' && isDefaultUahIcon ? (
-        <img alt="tezIcon" style={style} src={browser.runtime.getURL('misc/fiat-logos/uah.svg')} />
-      ) : (
-        <div className="flex justify-center items-center bg-gray-300" style={{ ...style, ...conditionalStyle }}>
-          <img
-            alt="currencyImage"
-            width={21}
-            height={15}
-            src={UTORG_FIAT_ICONS_BASE_URL + currencyName.slice(0, -1) + '.svg'}
-            onLoad={() => setIsFailed(false)}
-            onError={() => setIsFailed(true)}
-          />
-        </div>
-      )}
-      {isFailed && (
-        <img alt="fallbackIcon" style={style} src={browser.runtime.getURL('misc/token-logos/fallback.svg')} />
-      )}
-    </>
-  );
-};
diff --git a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.props.ts b/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.props.ts
deleted file mode 100644
index 93df8cb96a..0000000000
--- a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.props.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ReactNode } from 'react';
-
-export interface TopUpInputProps {
-  currencyName: string;
-  currenciesList: string[];
-  label: ReactNode;
-  setCurrencyName?: (value: string) => void;
-  isCurrenciesLoading?: boolean;
-  isSearchable?: boolean;
-  amount?: number;
-  className?: string;
-  singleToken?: boolean;
-  amountInputDisabled?: boolean;
-  isDefaultUahIcon?: boolean;
-  readOnly?: boolean;
-  minAmount?: string;
-  maxAmount?: string;
-  isMinAmountError?: boolean;
-  isMaxAmountError?: boolean;
-  isInsufficientTezBalanceError?: boolean;
-  onAmountChange?: (amount?: number) => void;
-}
diff --git a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.tsx b/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.tsx
deleted file mode 100644
index 743e162ea6..0000000000
--- a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, { FC } from 'react';
-
-import { Modifier } from '@popperjs/core';
-import classNames from 'clsx';
-
-import Popper from 'lib/ui/Popper';
-
-import { useFilteredCurrencies } from '../../hooks/useFilteredCurrencies.hook';
-import { CurrenciesMenu } from './CurrenciesMenu/CurrenciesMenu';
-import { TopUpInputProps } from './TopUpInput.props';
-import { TopUpInputHeader } from './TopUpInputHeader/TopUpInputHeader';
-
-const sameWidthModifiers: Array<Modifier<string, any>> = [
-  {
-    name: 'sameWidth',
-    enabled: true,
-    phase: 'beforeWrite',
-    requires: ['computeStyles'],
-    fn: ({ state }) => {
-      state.styles.popper.width = `${state.rects.reference.width}px`;
-    },
-    effect: ({ state }) => {
-      state.elements.popper.style.width = `${(state.elements.reference as any).offsetWidth}px`;
-      return () => {};
-    }
-  }
-];
-
-export const TopUpInput: FC<TopUpInputProps> = ({
-  currencyName,
-  currenciesList,
-  setCurrencyName = () => {},
-  className,
-  isCurrenciesLoading,
-  ...rest
-}) => {
-  const { filteredCurrencies, searchValue, setSearchValue } = useFilteredCurrencies(currenciesList);
-
-  return (
-    <div className={classNames('w-full', className)}>
-      <Popper
-        placement="bottom"
-        strategy="fixed"
-        modifiers={sameWidthModifiers}
-        fallbackPlacementsEnabled={false}
-        popup={({ opened, setOpened }) => (
-          <CurrenciesMenu
-            value={currencyName}
-            options={filteredCurrencies}
-            isLoading={isCurrenciesLoading}
-            opened={opened}
-            setOpened={setOpened}
-            onChange={currencyName => setCurrencyName(currencyName)}
-          />
-        )}
-      >
-        {({ ref, opened, toggleOpened, setOpened }) => (
-          <TopUpInputHeader
-            ref={ref as unknown as React.RefObject<HTMLDivElement>}
-            currencyName={currencyName}
-            currenciesList={currenciesList}
-            isCurrenciesLoading={isCurrenciesLoading}
-            setCurrencyName={setCurrencyName}
-            className={className}
-            opened={opened}
-            setOpened={setOpened}
-            toggleOpened={toggleOpened}
-            searchString={searchValue}
-            onSearchChange={e => setSearchValue(e.target.value)}
-            {...rest}
-          />
-        )}
-      </Popper>
-    </div>
-  );
-};
diff --git a/src/app/pages/Buy/Debit/Utorg/config.ts b/src/app/pages/Buy/Debit/Utorg/config.ts
deleted file mode 100644
index f322dfa871..0000000000
--- a/src/app/pages/Buy/Debit/Utorg/config.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const UTORG_TERMS_LINK = 'https://app.utorg.pro/terms';
-export const UTORG_PRIVICY_LINK = 'https://app.utorg.pro/privacy';
-
-export type booleanSetter = (v: boolean) => void;
diff --git a/src/app/pages/Buy/Debit/Utorg/hooks/useDisabledProceed.ts b/src/app/pages/Buy/Debit/Utorg/hooks/useDisabledProceed.ts
index b0b3127c3b..ab907e3e76 100644
--- a/src/app/pages/Buy/Debit/Utorg/hooks/useDisabledProceed.ts
+++ b/src/app/pages/Buy/Debit/Utorg/hooks/useDisabledProceed.ts
@@ -2,19 +2,20 @@ import { useMemo } from 'react';
 
 export const useDisabledProceed = (
   inputAmount: number | undefined,
-  outputAmount: number,
-  minXtzExchangeAmount: number,
-  maxXtzExchangeAmount: number,
+  minAmount: number,
+  maxAmount: number,
   isApiError: boolean
 ) => {
   const isMinAmountError = useMemo(
-    () => inputAmount !== undefined && inputAmount !== 0 && outputAmount < minXtzExchangeAmount,
-    [inputAmount, outputAmount, minXtzExchangeAmount]
+    () => inputAmount != null && inputAmount > 0 && inputAmount < minAmount,
+    [inputAmount, minAmount]
   );
+
   const isMaxAmountError = useMemo(
-    () => inputAmount !== undefined && inputAmount !== 0 && outputAmount > maxXtzExchangeAmount,
-    [inputAmount, outputAmount, maxXtzExchangeAmount]
+    () => inputAmount != null && inputAmount > 0 && inputAmount > maxAmount,
+    [inputAmount, maxAmount]
   );
+
   const disabledProceed = useMemo(
     () => isMinAmountError || isMaxAmountError || inputAmount === 0 || inputAmount === undefined || isApiError,
     [isMinAmountError, isMaxAmountError, inputAmount, isApiError]
diff --git a/src/app/pages/Buy/Debit/Utorg/hooks/useExchangeRate.ts b/src/app/pages/Buy/Debit/Utorg/hooks/useExchangeRate.ts
index 5d39bee1e6..e21b6e823e 100644
--- a/src/app/pages/Buy/Debit/Utorg/hooks/useExchangeRate.ts
+++ b/src/app/pages/Buy/Debit/Utorg/hooks/useExchangeRate.ts
@@ -1,22 +1,22 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import { getExchangeRate } from 'lib/apis/utorg';
 
-import { booleanSetter } from '../config';
-
-export const useExchangeRate = (inputAmount = 0, inputCurrency: string, setLoading: booleanSetter) => {
+export const useExchangeRate = (inputAmount = 0, minAmount = 0, inputCurrency: string) => {
   const [exchangeRate, setExchangeRate] = useState(0);
+  const [isLoading, setLoading] = useState(false);
 
-  const updateExchangeRateRequest = useCallback(() => {
-    setLoading(true);
-    getExchangeRate(inputAmount, inputCurrency)
-      .then(exchangeRate => setExchangeRate(exchangeRate))
-      .finally(() => setLoading(false));
-  }, [inputAmount, inputCurrency, setLoading]);
+  const amount = inputAmount < minAmount ? minAmount : inputAmount;
 
   useEffect(() => {
-    updateExchangeRateRequest();
-  }, [updateExchangeRateRequest]);
+    setLoading(true);
+    getExchangeRate(amount, inputCurrency)
+      .then((fetchedRate = 0) => {
+        const rate = Number(fetchedRate.toPrecision(4)) || 0;
+        setExchangeRate(rate);
+      })
+      .finally(() => setLoading(false));
+  }, [amount, inputCurrency, setLoading]);
 
-  return exchangeRate;
+  return { isRateLoading: isLoading, exchangeRate };
 };
diff --git a/src/app/pages/Buy/Debit/Utorg/hooks/useFilteredCurrencies.hook.ts b/src/app/pages/Buy/Debit/Utorg/hooks/useFilteredCurrencies.hook.ts
deleted file mode 100644
index 051440e6de..0000000000
--- a/src/app/pages/Buy/Debit/Utorg/hooks/useFilteredCurrencies.hook.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useMemo, useState } from 'react';
-
-import { useDebounce } from 'use-debounce';
-
-export const useFilteredCurrencies = (currencies: string[]) => {
-  const [searchValue, setSearchValue] = useState('');
-  const [searchValueDebounced] = useDebounce(searchValue, 300);
-
-  const filteredCurrencies = useMemo<string[]>(() => {
-    if (searchValueDebounced) {
-      const lowerCaseSearchValue = searchValueDebounced.toLowerCase();
-      const result: string[] = [];
-
-      for (const currencyName of currencies) {
-        if (currencyName.toLowerCase().includes(lowerCaseSearchValue)) {
-          result.push(currencyName);
-        }
-      }
-
-      return result;
-    } else {
-      return currencies;
-    }
-  }, [searchValueDebounced, currencies]);
-
-  return {
-    filteredCurrencies,
-    searchValue,
-    setSearchValue
-  };
-};
diff --git a/src/app/pages/Buy/Debit/Utorg/hooks/useOutputAmount.ts b/src/app/pages/Buy/Debit/Utorg/hooks/useOutputAmount.ts
index 1681e26d86..13122561cb 100644
--- a/src/app/pages/Buy/Debit/Utorg/hooks/useOutputAmount.ts
+++ b/src/app/pages/Buy/Debit/Utorg/hooks/useOutputAmount.ts
@@ -2,10 +2,9 @@ import { useCallback, useEffect, useState } from 'react';
 
 import { convertFiatAmountToXtz } from 'lib/apis/utorg';
 
-import { booleanSetter } from '../config';
-
-export const useOutputAmount = (inputAmountDebounced = 0, inputCurrency: string, setLoading: booleanSetter) => {
+export const useOutputAmount = (inputAmountDebounced = 0, inputCurrency: string) => {
   const [outputAmount, setOutputAmount] = useState(0);
+  const [isLoading, setLoading] = useState(false);
 
   const updateOutputRequest = useCallback(() => {
     setLoading(true);
@@ -18,5 +17,5 @@ export const useOutputAmount = (inputAmountDebounced = 0, inputCurrency: string,
     updateOutputRequest();
   }, [updateOutputRequest]);
 
-  return outputAmount;
+  return { isOutputLoading: isLoading, outputAmount };
 };
diff --git a/src/app/pages/Buy/Debit/Utorg/hooks/useUpdatedExchangeInfo.ts b/src/app/pages/Buy/Debit/Utorg/hooks/useUpdatedExchangeInfo.ts
index 5b6144ed40..a3152f38f4 100644
--- a/src/app/pages/Buy/Debit/Utorg/hooks/useUpdatedExchangeInfo.ts
+++ b/src/app/pages/Buy/Debit/Utorg/hooks/useUpdatedExchangeInfo.ts
@@ -1,35 +1,38 @@
 import { useCallback, useEffect, useState } from 'react';
 
+import { CurrencyFiat } from 'app/templates/TopUpInput/types';
 import { getAvailableFiatCurrencies, getMinMaxExchangeValue } from 'lib/apis/utorg';
 
-import { booleanSetter } from '../config';
+import { buildIconSrc } from '../utils';
 
-export const useUpdatedExchangeInfo = (setLoading: booleanSetter, setIsApiError: booleanSetter) => {
+export const useUpdatedExchangeInfo = (currency: string, setIsApiError: (v: boolean) => void) => {
   const [isMinMaxLoading, setIsMinMaxLoading] = useState(false);
+  const [isLoading, setLoading] = useState(false);
 
-  const [currencies, setCurrencies] = useState<string[]>([]);
-  const [minXtzExchangeAmount, setMinXtzExchangeAmount] = useState(15);
-  const [maxXtzExchangeAmount, setMaxXtzExchangeAmount] = useState(5000);
+  const [currencies, setCurrencies] = useState<CurrencyFiat[]>([]);
+  const [minAmount, setMinAmount] = useState(0);
+  const [maxAmount, setMaxAmount] = useState(NaN);
 
   const updateMinMaxRequest = useCallback(() => {
     setIsMinMaxLoading(true);
-    getMinMaxExchangeValue()
+    getMinMaxExchangeValue(currency)
       .then(({ minAmount, maxAmount }) => {
-        setMinXtzExchangeAmount(minAmount);
-        setMaxXtzExchangeAmount(maxAmount);
+        setMinAmount(minAmount);
+        setMaxAmount(maxAmount);
         setIsMinMaxLoading(false);
       })
-      .catch(() => {
+      .catch(error => {
+        console.error(error);
         setIsApiError(true);
         setIsMinMaxLoading(false);
       });
-  }, [setIsApiError, setIsMinMaxLoading]);
+  }, [currency, setIsApiError, setIsMinMaxLoading]);
 
   const updateCurrenciesRequest = useCallback(() => {
     setLoading(true);
     getAvailableFiatCurrencies()
-      .then(currencies => {
-        setCurrencies(currencies);
+      .then(codes => {
+        setCurrencies(codes.map(code => ({ code, icon: buildIconSrc(code) })));
         setLoading(false);
       })
       .catch(() => {
@@ -44,9 +47,10 @@ export const useUpdatedExchangeInfo = (setLoading: booleanSetter, setIsApiError:
   }, [updateMinMaxRequest, updateCurrenciesRequest]);
 
   return {
+    isCurrenciesLoading: isLoading,
     currencies,
-    minXtzExchangeAmount,
-    maxXtzExchangeAmount,
+    minAmount,
+    maxAmount,
     isMinMaxLoading
   };
 };
diff --git a/src/app/pages/Buy/Debit/Utorg/utils.ts b/src/app/pages/Buy/Debit/Utorg/utils.ts
new file mode 100644
index 0000000000..3abcce92f5
--- /dev/null
+++ b/src/app/pages/Buy/Debit/Utorg/utils.ts
@@ -0,0 +1,6 @@
+export const UTORG_TERMS_LINK = 'https://app.utorg.pro/terms';
+export const UTORG_PRIVICY_LINK = 'https://app.utorg.pro/privacy';
+
+const UTORG_FIAT_ICONS_BASE_URL = 'https://utorg.pro/img/flags2/icon-';
+
+export const buildIconSrc = (currencyCode: string) => `${UTORG_FIAT_ICONS_BASE_URL}${currencyCode.slice(0, -1)}.svg`;
diff --git a/src/app/pages/NewWallet/CreateWallet.tsx b/src/app/pages/NewWallet/CreateWallet.tsx
index 80d4746110..43f05b002d 100644
--- a/src/app/pages/NewWallet/CreateWallet.tsx
+++ b/src/app/pages/NewWallet/CreateWallet.tsx
@@ -9,7 +9,7 @@ import { useTempleClient } from '../../../lib/temple/front';
 import { NewSeedBackup } from './create/NewSeedBackup';
 import { NewSeedVerify } from './create/NewSeedVerify';
 import { LockedWalletExists } from './LockedWalletExists';
-import { SetWalletPassword } from './SetWalletPassword';
+import { SetWalletPassword } from './setWalletPassword/SetWalletPassword';
 import { Template } from './Template';
 
 export const CreateWallet: FC = () => {
diff --git a/src/app/pages/NewWallet/ImportWallet.tsx b/src/app/pages/NewWallet/ImportWallet.tsx
index 3726fb4d5c..6224d1a25d 100644
--- a/src/app/pages/NewWallet/ImportWallet.tsx
+++ b/src/app/pages/NewWallet/ImportWallet.tsx
@@ -6,9 +6,9 @@ import { TID, t } from 'lib/i18n';
 import { useTempleClient } from '../../../lib/temple/front';
 import ImportTabSwitcher from '../../atoms/ImportTabSwitcher';
 import { ImportFromKeystoreFile } from './import/ImportFromKeystoreFile';
-import { ImportFromSeedPhrase } from './import/ImportFromSeedPhrase';
+import { ImportFromSeedPhrase } from './import/ImportSeedPhrase/ImportFromSeedPhrase';
 import { LockedWalletExists } from './LockedWalletExists';
-import { SetWalletPassword } from './SetWalletPassword';
+import { SetWalletPassword } from './setWalletPassword/SetWalletPassword';
 
 interface ImportWalletProps {
   tabSlug?: string;
diff --git a/src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.test-ids.ts b/src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.test-ids.ts
new file mode 100644
index 0000000000..31428bdf81
--- /dev/null
+++ b/src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.test-ids.ts
@@ -0,0 +1,4 @@
+export enum ImportFromSeedPhraseTestIds {
+  nextButton = 'Import Existing Seed Phrase/Next button',
+  wordInput = 'Import Existing Seed Phrase/Word input'
+}
diff --git a/src/app/pages/NewWallet/import/ImportFromSeedPhrase.tsx b/src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.tsx
similarity index 80%
rename from src/app/pages/NewWallet/import/ImportFromSeedPhrase.tsx
rename to src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.tsx
index b79c7c66d1..dd0599aa0f 100644
--- a/src/app/pages/NewWallet/import/ImportFromSeedPhrase.tsx
+++ b/src/app/pages/NewWallet/import/ImportSeedPhrase/ImportFromSeedPhrase.tsx
@@ -5,6 +5,8 @@ import { useForm } from 'react-hook-form';
 import { FormSubmitButton, SeedPhraseInput } from 'app/atoms';
 import { T, t } from 'lib/i18n';
 
+import { ImportFromSeedPhraseTestIds } from './ImportFromSeedPhrase.test-ids';
+
 interface ImportFromSeedPhraseProps {
   seedPhrase: string;
   setSeedPhrase: (seed: string) => void;
@@ -37,8 +39,12 @@ export const ImportFromSeedPhrase: FC<ImportFromSeedPhraseProps> = ({
         onChange={setSeedPhrase}
         setSeedError={setSeedError}
         reset={reset}
+        testID={ImportFromSeedPhraseTestIds.wordInput}
       />
-      <FormSubmitButton style={{ display: 'block', width: 384, margin: '40px auto', fontSize: 14, fontWeight: 500 }}>
+      <FormSubmitButton
+        style={{ display: 'block', width: 384, margin: '40px auto', fontSize: 14, fontWeight: 500 }}
+        testID={ImportFromSeedPhraseTestIds.nextButton}
+      >
         <T id="next" />
       </FormSubmitButton>
     </form>
diff --git a/src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.test-ids.ts b/src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.test-ids.ts
new file mode 100644
index 0000000000..2a88656936
--- /dev/null
+++ b/src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.test-ids.ts
@@ -0,0 +1,7 @@
+export enum setWalletPasswordTestIDS {
+  passwordField = 'Register Form/Password Field',
+  repeatPasswordField = 'Register Form/Repeat Password Field',
+  skipOnboardingCheckbox = 'Register Form/Skip Onboarding Checkbox',
+  acceptTermsCheckbox = 'Register Form/Accept Terms Checkbox',
+  importButton = 'Register Form/Import Button'
+}
diff --git a/src/app/pages/NewWallet/SetWalletPassword.tsx b/src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.tsx
similarity index 90%
rename from src/app/pages/NewWallet/SetWalletPassword.tsx
rename to src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.tsx
index 4f39295adc..a73887fb58 100644
--- a/src/app/pages/NewWallet/SetWalletPassword.tsx
+++ b/src/app/pages/NewWallet/setWalletPassword/SetWalletPassword.tsx
@@ -4,7 +4,7 @@ import classNames from 'clsx';
 import { Controller, useForm } from 'react-hook-form';
 
 import { PASSWORD_ERROR_CAPTION, FormField, FormSubmitButton, FormCheckbox } from 'app/atoms';
-import { AnalyticsEventCategory, useAnalytics, useAnalyticsSettings } from 'lib/analytics';
+import { AnalyticsEventCategory, TestIDProps, useAnalytics, useAnalyticsSettings } from 'lib/analytics';
 import { T, t } from 'lib/i18n';
 import { useTempleClient } from 'lib/temple/front';
 import PasswordStrengthIndicator, { PasswordValidation } from 'lib/ui/PasswordStrengthIndicator';
@@ -16,12 +16,13 @@ import {
   PASSWORD_PATTERN,
   specialCharacterRegx,
   uppercaseLowercaseMixtureRegx
-} from '../../defaults';
-import { useOnboardingProgress } from '../Onboarding/hooks/useOnboardingProgress.hook';
+} from '../../../defaults';
+import { useOnboardingProgress } from '../../Onboarding/hooks/useOnboardingProgress.hook';
+import { setWalletPasswordTestIDS } from './SetWalletPassword.test-ids';
 
 const MIN_PASSWORD_LENGTH = 8;
 
-interface FormData {
+interface FormData extends TestIDProps {
   shouldUseKeystorePassword?: boolean;
   password?: string;
   repeatPassword?: string;
@@ -34,6 +35,7 @@ interface SetWalletPasswordProps {
   ownMnemonic?: boolean;
   seedPhrase: string;
   keystorePassword?: string;
+  testID?: string;
 }
 
 export const SetWalletPassword: FC<SetWalletPasswordProps> = ({
@@ -178,6 +180,7 @@ export const SetWalletPassword: FC<SetWalletPasswordProps> = ({
             errorCaption={errors.password?.message}
             onFocus={() => setFocused(true)}
             onChange={handlePasswordChange}
+            testID={setWalletPasswordTestIDS.passwordField}
           />
 
           {passwordValidation && (
@@ -204,6 +207,7 @@ export const SetWalletPassword: FC<SetWalletPasswordProps> = ({
             placeholder="********"
             errorCaption={errors.repeatPassword?.message}
             containerClassName="my-6"
+            testID={setWalletPasswordTestIDS.repeatPasswordField}
           />
         </>
       )}
@@ -238,10 +242,11 @@ export const SetWalletPassword: FC<SetWalletPasswordProps> = ({
       <Controller
         control={control}
         name="skipOnboarding"
-        as={FormCheckbox}
+        as={p => <FormCheckbox {...p} testID={setWalletPasswordTestIDS.skipOnboardingCheckbox} />}
         label={t('skipOnboarding')}
         labelDescription={t('advancedUser')}
         containerClassName="mb-4"
+        testID={setWalletPasswordTestIDS.skipOnboardingCheckbox}
       />
 
       <FormCheckbox
@@ -251,6 +256,7 @@ export const SetWalletPassword: FC<SetWalletPasswordProps> = ({
         errorCaption={errors.termsAccepted?.message}
         name="termsAccepted"
         label={t('acceptTerms')}
+        testID={setWalletPasswordTestIDS.acceptTermsCheckbox}
         labelDescription={
           <T
             id="acceptTermsInputDescription"
@@ -285,7 +291,11 @@ export const SetWalletPassword: FC<SetWalletPasswordProps> = ({
         containerClassName="mb-8"
       />
 
-      <FormSubmitButton loading={submitting} style={{ display: 'block', width: '100%', fontSize: 14, fontWeight: 500 }}>
+      <FormSubmitButton
+        loading={submitting}
+        style={{ display: 'block', width: '100%', fontSize: 14, fontWeight: 500 }}
+        testID={setWalletPasswordTestIDS.importButton}
+      >
         <T id={ownMnemonic ? 'import' : 'create'} />
       </FormSubmitButton>
     </form>
diff --git a/src/app/pages/Onboarding/pages/AttentionPage.tsx b/src/app/pages/Onboarding/pages/AttentionPage.tsx
index 23292ce8b1..bf7c2d528e 100644
--- a/src/app/pages/Onboarding/pages/AttentionPage.tsx
+++ b/src/app/pages/Onboarding/pages/AttentionPage.tsx
@@ -3,7 +3,7 @@ import React, { FC } from 'react';
 import { Button } from 'app/atoms/Button';
 import { useAppEnv } from 'app/env';
 import PageLayout from 'app/layouts/PageLayout';
-import { isSafeBrowserVersion } from 'lib/browser-info';
+import { isBrowserVersionSafe } from 'lib/browser';
 import { T } from 'lib/i18n';
 
 import styles from '../Onboarding.module.css';
@@ -11,6 +11,8 @@ import styles from '../Onboarding.module.css';
 const AttentionPage: FC = () => {
   const { onBack } = useAppEnv();
 
+  const browserVersionIsSafe = isBrowserVersionSafe();
+
   return (
     <PageLayout
       pageTitle={
@@ -23,12 +25,12 @@ const AttentionPage: FC = () => {
         <p className={styles['title']}>
           <T id={'attention'} />
         </p>
-        {!isSafeBrowserVersion && (
+        {!browserVersionIsSafe && (
           <p className={styles['alert']}>
             <T id={'browserVersionIsOutOfDate'} />
           </p>
         )}
-        <p className={styles['description']} style={isSafeBrowserVersion ? {} : { marginTop: 24 }}>
+        <p className={styles['description']} style={browserVersionIsSafe ? {} : { marginTop: 24 }}>
           <T id={'attentionDescription'} />
         </p>
         <p className={styles['description']} style={{ textAlign: 'start', marginBottom: 20 }}>
diff --git a/src/app/pages/Welcome/Welcome.test-ids.ts b/src/app/pages/Welcome/Welcome.test-ids.ts
new file mode 100644
index 0000000000..1e3fd6707c
--- /dev/null
+++ b/src/app/pages/Welcome/Welcome.test-ids.ts
@@ -0,0 +1,4 @@
+export enum WelcomeTestIds {
+  importExistingWallet = 'Welcome/Import Existing Wallet button',
+  createNewWallet = 'Welcome/Create New Wallet button'
+}
diff --git a/src/app/pages/Welcome.tsx b/src/app/pages/Welcome/Welcome.tsx
similarity index 91%
rename from src/app/pages/Welcome.tsx
rename to src/app/pages/Welcome/Welcome.tsx
index 5feee92fac..79493b8d5f 100644
--- a/src/app/pages/Welcome.tsx
+++ b/src/app/pages/Welcome/Welcome.tsx
@@ -9,7 +9,10 @@ import { ReactComponent as LedgerNanoIcon } from 'app/misc/ledger.svg';
 import { TID, T } from 'lib/i18n';
 import { Link } from 'lib/woozie';
 
-interface TSign {
+import { TestIDProps } from '../../../lib/analytics';
+import { WelcomeTestIds } from './Welcome.test-ids';
+
+interface TSign extends TestIDProps {
   key: string;
   linkTo: string;
   filled: boolean;
@@ -27,7 +30,8 @@ const SIGNS: TSign[] = [
       <EntranceIcon className={classNames('transform rotate-90', className)} {...rest} />
     ),
     titleI18nKey: 'importExistingWallet',
-    descriptionI18nKey: 'importExistingWalletDescription'
+    descriptionI18nKey: 'importExistingWalletDescription',
+    testID: WelcomeTestIds.importExistingWallet
   },
   {
     key: 'create',
@@ -35,7 +39,8 @@ const SIGNS: TSign[] = [
     filled: true,
     Icon: FolderAddIcon,
     titleI18nKey: 'createNewWallet',
-    descriptionI18nKey: 'createNewWalletDescription'
+    descriptionI18nKey: 'createNewWalletDescription',
+    testID: WelcomeTestIds.createNewWallet
   }
 ];
 
@@ -58,7 +63,7 @@ const Welcome: FC = () => {
       </div>
 
       <div className={classNames('w-full', 'my-4', 'flex items-stretch')}>
-        {SIGNS.map(({ key, linkTo, filled, Icon, titleI18nKey, descriptionI18nKey }) => (
+        {SIGNS.map(({ key, linkTo, filled, Icon, titleI18nKey, descriptionI18nKey, testID }) => (
           <div key={key} className={classNames('w-1/2', 'p-4')}>
             <Link
               to={linkTo}
@@ -71,6 +76,7 @@ const Welcome: FC = () => {
                 'transform hover:scale-110 focus:scale-110',
                 'shadow-md hover:shadow-lg focus:shadow-lg'
               )}
+              testID={testID}
             >
               <div className={classNames('absolute inset-0', 'p-1')}>
                 <div
diff --git a/src/app/pages/Withdraw/Debit/AliceBob/steps/InitialStep.tsx b/src/app/pages/Withdraw/Debit/AliceBob/steps/InitialStep.tsx
index ab5ef22ebd..36eb4d353b 100644
--- a/src/app/pages/Withdraw/Debit/AliceBob/steps/InitialStep.tsx
+++ b/src/app/pages/Withdraw/Debit/AliceBob/steps/InitialStep.tsx
@@ -9,11 +9,12 @@ import { useMinMaxExchangeAmounts } from 'app/hooks/AliceBob/useMinMaxExchangeAm
 import { useOutputEstimation } from 'app/hooks/AliceBob/useOutputEstimation';
 import { ReactComponent as AlertIcon } from 'app/icons/alert.svg';
 import styles from 'app/pages/Buy/Crypto/Exolix/Exolix.module.css';
-import { TopUpInput } from 'app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInput';
 import { WithdrawSelectors } from 'app/pages/Withdraw/Withdraw.selectors';
+import { TopUpInput } from 'app/templates/TopUpInput';
 import { useAnalyticsState } from 'lib/analytics/use-analytics-state.hook';
 import { createAliceBobOrder } from 'lib/apis/temple';
 import { t, T } from 'lib/i18n/react';
+import { FIAT_ICONS_SRC } from 'lib/icons';
 
 import { CardNumberInput } from '../components/CardNumberInput';
 import { useCardNumberInput } from '../components/use-card-number-input.hook';
@@ -98,12 +99,10 @@ export const InitialStep: FC<Omit<StepProps, 'orderInfo'>> = ({ isApiError, setO
 
       <div className="mx-auto mt-10 text-center font-inter font-normal text-gray-700">
         <TopUpInput
-          singleToken
-          isDefaultUahIcon
           amountInputDisabled={isMinMaxLoading}
           amount={inputAmount}
           label={<T id="send" />}
-          currencyName="TEZ"
+          currency={{ code: 'TEZ' }}
           currenciesList={[]}
           minAmount={minExchangeAmount.toString()}
           maxAmount={maxExchangeAmount.toString()}
@@ -117,11 +116,9 @@ export const InitialStep: FC<Omit<StepProps, 'orderInfo'>> = ({ isApiError, setO
         <br />
         <TopUpInput
           readOnly
-          singleToken
-          isDefaultUahIcon
           amountInputDisabled
           label={<T id="get" />}
-          currencyName="UAH"
+          currency={{ code: 'UAH', icon: FIAT_ICONS_SRC.UAH }}
           currenciesList={[]}
           amount={outputAmount}
         />
diff --git a/src/app/templates/AssetIcon.tsx b/src/app/templates/AssetIcon.tsx
index 82a352bd08..a8bbc5eb2c 100644
--- a/src/app/templates/AssetIcon.tsx
+++ b/src/app/templates/AssetIcon.tsx
@@ -1,19 +1,20 @@
-import React, { FC, useState } from 'react';
+import React, { FC, useMemo } from 'react';
 
 import classNames from 'clsx';
 
 import Identicon from 'app/atoms/Identicon';
 import { ReactComponent as CollectiblePlaceholder } from 'app/icons/collectible-placeholder.svg';
-import { formatObjktSmallAssetUri, formatAssetUri } from 'lib/image-uri';
+import { buildTokenIconURLs, buildCollectibleImageURLs } from 'lib/image-uri';
 import { useAssetMetadata } from 'lib/temple/front';
 import { AssetMetadata, getAssetSymbol } from 'lib/temple/metadata';
+import { Image } from 'lib/ui/Image';
 
-interface AssetIconPlaceholderProps {
+interface PlaceholderProps {
   metadata: AssetMetadata | null;
   size?: number;
 }
 
-const AssetIconPlaceholder: FC<AssetIconPlaceholderProps> = ({ metadata, size }) => {
+const AssetIconPlaceholder: FC<PlaceholderProps> = ({ metadata, size }) => {
   const isCollectible = Boolean(metadata?.artifactUri);
 
   return isCollectible ? (
@@ -23,78 +24,37 @@ const AssetIconPlaceholder: FC<AssetIconPlaceholderProps> = ({ metadata, size })
   );
 };
 
-interface AssetIconProps {
+interface Props {
   assetSlug: string;
   className?: string;
   size?: number;
 }
 
-interface LoadStrategy {
-  type: string;
-  formatUriFn: (value: string) => string;
-  field: 'thumbnailUri' | 'artifactUri' | 'displayUri' | 'assetSlug';
-}
-
-const tokenLoadStrategy: Array<LoadStrategy> = [
-  { type: 'thumbnailUri', formatUriFn: formatAssetUri, field: 'thumbnailUri' }
-];
-const collectibleLoadStrategy: Array<LoadStrategy> = [
-  { type: 'objktSmall', formatUriFn: formatObjktSmallAssetUri, field: 'assetSlug' },
-  { type: 'displayUri', formatUriFn: formatAssetUri, field: 'displayUri' },
-  { type: 'artifactUri', formatUriFn: formatAssetUri, field: 'artifactUri' },
-  { type: 'thumbnailUri', formatUriFn: formatAssetUri, field: 'thumbnailUri' }
-];
+export const AssetIcon: FC<Props> = ({ assetSlug, className, size }) => {
+  const metadata = useAssetMetadata(assetSlug);
 
-type ImageRequestObject = (AssetMetadata | null) & { assetSlug: string };
-
-const getFirstFallback = (
-  strategy: Array<LoadStrategy>,
-  currentState: Record<string, boolean>,
-  metadata: ImageRequestObject
-): LoadStrategy => {
-  for (const strategyItem of strategy) {
-    if (metadata && metadata[strategyItem.field] && !currentState[strategyItem.type]) {
-      return strategyItem;
-    }
-  }
-  return strategy[0];
-};
-
-export const AssetIcon: FC<AssetIconProps> = ({ assetSlug, className, size }) => {
-  const [isLoaded, setIsLoaded] = useState(false);
-  const metadata = useAssetMetadata(assetSlug)!;
   const isCollectible = Boolean(metadata?.artifactUri);
-  const loadStrategy = isCollectible ? collectibleLoadStrategy : tokenLoadStrategy;
-  const [isLoadingFailed, setIsLoadingFailed] = useState(
-    loadStrategy.reduce<Record<string, boolean>>((acc, cur) => ({ ...acc, [cur.type]: false }), {})
-  );
-
-  const imageRequestObject: ImageRequestObject = { ...metadata, assetSlug };
-  const currentFallback = getFirstFallback(loadStrategy, isLoadingFailed, imageRequestObject);
-  const imageSrc = currentFallback.formatUriFn(imageRequestObject[currentFallback.field] ?? assetSlug);
 
-  const handleLoad = () => setIsLoaded(true);
-  const handleError = () => setIsLoadingFailed(prevState => ({ ...prevState, [currentFallback.type]: true }));
+  const src = useMemo(() => {
+    if (isCollectible) return buildCollectibleImageURLs(assetSlug, metadata, size == null);
+    else return buildTokenIconURLs(metadata?.thumbnailUri, size == null);
+  }, [metadata, assetSlug]);
 
   return (
     <div className={classNames('flex items-center justify-center', className)}>
-      {imageSrc !== '' && (
-        <img
-          src={imageSrc}
-          alt={metadata?.name}
-          style={{
-            ...(!isLoaded ? { display: 'none' } : {}),
-            objectFit: 'contain',
-            maxWidth: `100%`,
-            maxHeight: `100%`
-          }}
-          height={size}
-          width={size}
-          onLoad={handleLoad}
-          onError={handleError}
-        />
-      )}
-      {(!isLoaded || !metadata || imageSrc === '') && <AssetIconPlaceholder metadata={metadata} size={size} />}
+      <Image
+        src={src}
+        loader={<AssetIconPlaceholder metadata={metadata} size={size} />}
+        fallback={<AssetIconPlaceholder metadata={metadata} size={size} />}
+        alt={metadata?.name}
+        style={{
+          objectFit: 'contain',
+          maxWidth: '100%',
+          maxHeight: '100%'
+        }}
+        height={size}
+        width={size}
+      />
     </div>
   );
 };
diff --git a/src/app/templates/AssetInfo.tsx b/src/app/templates/AssetInfo.tsx
index 3e85e9ce45..a2c0756c17 100644
--- a/src/app/templates/AssetInfo.tsx
+++ b/src/app/templates/AssetInfo.tsx
@@ -46,7 +46,7 @@ const AssetInfo: FC<AssetInfoProps> = ({ assetSlug }) => {
           <InfoField id="token-id" label={<T id="tokenId" />} value={new BigNumber(asset.id).toFixed()} />
         )}
 
-        {metadata && metadata.decimals && (
+        {metadata && metadata.decimals > 0 && (
           <InfoField id="token-decimals" label={<T id="decimals" />} value={metadata.decimals} />
         )}
       </div>
diff --git a/src/app/templates/AssetSelect/AssetSelect.tsx b/src/app/templates/AssetSelect/AssetSelect.tsx
index d824664d54..fedba69789 100644
--- a/src/app/templates/AssetSelect/AssetSelect.tsx
+++ b/src/app/templates/AssetSelect/AssetSelect.tsx
@@ -24,7 +24,7 @@ type AssetSelectProps = {
 const AssetSelect: FC<AssetSelectProps> = ({ value, assets, onChange, className }) => {
   const title = useMemo(
     () => (
-      <h2 className={classNames('mb-4', 'leading-tight', 'flex flex-col')}>
+      <h2 className="mb-4 leading-tight flex flex-col">
         <span className="text-base font-semibold text-gray-700">
           <T id="asset" />
         </span>
diff --git a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrencyOption/CurrencyOption.tsx b/src/app/templates/TopUpInput/CurrenciesMenu/CurrencyOption.tsx
similarity index 68%
rename from src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrencyOption/CurrencyOption.tsx
rename to src/app/templates/TopUpInput/CurrenciesMenu/CurrencyOption.tsx
index 031cc260e6..6301faa294 100644
--- a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrencyOption/CurrencyOption.tsx
+++ b/src/app/templates/TopUpInput/CurrenciesMenu/CurrencyOption.tsx
@@ -3,31 +3,29 @@ import React, { FC } from 'react';
 import classNames from 'clsx';
 import { ListRowProps } from 'react-virtualized';
 
-import { CurrencyInterface } from '../../../../exolix.interface';
-import { getProperNetworkFullName } from '../../../../exolix.util';
-import { StaticCurrencyImage } from '../../StaticCurrencyImage/StaticCurrencyImage';
+import { StaticCurrencyImage } from '../StaticCurrencyImage';
+import { CurrencyBase } from '../types';
+import { getProperNetworkFullName } from '../utils';
 
 interface Props extends Partial<Pick<ListRowProps, 'style'>> {
-  currency: CurrencyInterface;
+  currency: CurrencyBase;
   isSelected: boolean;
-  onClick: (newValue: CurrencyInterface) => void;
+  fitIcons?: boolean;
+  onClick?: (newValue: CurrencyBase) => void;
 }
 
-export const CurrencyOption: FC<Props> = ({ currency, isSelected, style, onClick }) => (
+export const CurrencyOption: FC<Props> = ({ currency, isSelected, fitIcons, style, onClick }) => (
   <button
     type="button"
     style={style}
     className={classNames('p-4 w-full flex items-center', isSelected && 'bg-gray-200')}
-    onClick={() => onClick(currency)}
+    onClick={onClick && (() => onClick(currency))}
   >
     <StaticCurrencyImage
       currencyCode={currency.code}
+      isFiat={Boolean(currency.network)}
       imageSrc={currency.icon}
-      style={{
-        borderRadius: '50%',
-        width: 32,
-        height: 32
-      }}
+      fitImg={fitIcons}
     />
     <div className="flex flex-col ml-2 text-left">
       <div className="flex items-center">
diff --git a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx b/src/app/templates/TopUpInput/CurrenciesMenu/index.tsx
similarity index 72%
rename from src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx
rename to src/app/templates/TopUpInput/CurrenciesMenu/index.tsx
index 981ff83c97..b96204f044 100644
--- a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/CurrenciesMenu/CurrenciesMenu.tsx
+++ b/src/app/templates/TopUpInput/CurrenciesMenu/index.tsx
@@ -7,27 +7,38 @@ import Spinner from 'app/atoms/Spinner/Spinner';
 import { useAppEnvStyle } from 'app/hooks/use-app-env-style.hook';
 import { T } from 'lib/i18n';
 
-import { CurrencyInterface } from '../../../exolix.interface';
-import { CurrencyOption } from './CurrencyOption/CurrencyOption';
+import { CurrencyBase } from '../types';
+import { CurrencyOption } from './CurrencyOption';
 
 interface Props {
-  value: CurrencyInterface;
-  options: CurrencyInterface[];
+  value: CurrencyBase;
+  options: CurrencyBase[];
   isLoading?: boolean;
   opened: boolean;
+  fitIcons?: boolean;
   setOpened: (newValue: boolean) => void;
-  onChange: (newValue: CurrencyInterface) => void;
+  onChange?: (newValue: CurrencyBase) => void;
 }
 
-export const CurrenciesMenu: FC<Props> = ({ value, options, isLoading = false, opened, setOpened, onChange }) => {
+export const CurrenciesMenu: FC<Props> = ({
+  value,
+  options,
+  isLoading = false,
+  opened,
+  fitIcons,
+  setOpened,
+  onChange
+}) => {
   const { dropdownWidth } = useAppEnvStyle();
 
-  const handleOptionClick = (newValue: CurrencyInterface) => {
-    if (value.code !== newValue.code || value.network !== newValue.network) {
-      onChange(newValue);
-    }
-    setOpened(false);
-  };
+  const handleOptionClick = onChange
+    ? (newValue: CurrencyBase) => {
+        if (value.code !== newValue.code || value.network !== newValue.network) {
+          onChange(newValue);
+        }
+        setOpened(false);
+      }
+    : undefined;
 
   return (
     <DropdownWrapper
@@ -61,6 +72,7 @@ export const CurrenciesMenu: FC<Props> = ({ value, options, isLoading = false, o
             key={key}
             currency={options[index]}
             isSelected={value.code === options[index].code && value.network === options[index].network}
+            fitIcons={fitIcons}
             style={style}
             onClick={handleOptionClick}
           />
diff --git a/src/app/templates/TopUpInput/StaticCurrencyImage.tsx b/src/app/templates/TopUpInput/StaticCurrencyImage.tsx
new file mode 100644
index 0000000000..2c2ec08fd8
--- /dev/null
+++ b/src/app/templates/TopUpInput/StaticCurrencyImage.tsx
@@ -0,0 +1,47 @@
+import React, { FC, useMemo, useState } from 'react';
+
+import { FIAT_FALLBACK_ICON_SRC, TOKEN_FALLBACK_ICON_SRC, TOKENS_ICONS_SRC } from 'lib/icons';
+
+const ROUNDING_STYLE = { borderRadius: '50%', width: 32, height: 32 };
+
+interface Props {
+  currencyCode: string;
+  isFiat?: boolean;
+  imageSrc?: string;
+  fitImg?: boolean;
+}
+
+export const StaticCurrencyImage: FC<Props> = ({ currencyCode, isFiat, imageSrc, fitImg }) => {
+  const [isFailed, setIsFailed] = useState(false);
+
+  const conditionalStyle = useMemo(() => ({ display: isFailed ? 'none' : undefined }), [isFailed]);
+
+  const isTez = currencyCode === 'TEZ' || currencyCode === 'XTZ';
+
+  const src = isTez ? TOKENS_ICONS_SRC.TEZ : imageSrc;
+
+  if (isFailed || !src)
+    return (
+      <img alt={currencyCode} style={ROUNDING_STYLE} src={isFiat ? FIAT_FALLBACK_ICON_SRC : TOKEN_FALLBACK_ICON_SRC} />
+    );
+
+  const imgProps = {
+    alt: currencyCode,
+    src,
+    onLoad: () => setIsFailed(false),
+    onError: () => setIsFailed(true)
+  };
+
+  const style = { ...ROUNDING_STYLE, ...conditionalStyle };
+
+  if (fitImg && isTez === false)
+    return (
+      <div className="flex justify-center items-center bg-gray-300" style={style}>
+        {/* eslint-disable-next-line jsx-a11y/alt-text */}
+        <img {...imgProps} width={21} height={15} />
+      </div>
+    );
+
+  // eslint-disable-next-line jsx-a11y/alt-text
+  return <img {...imgProps} style={style} />;
+};
diff --git a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInputHeader/TopUpInputHeader.tsx b/src/app/templates/TopUpInput/TopUpInputHeader.tsx
similarity index 89%
rename from src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInputHeader/TopUpInputHeader.tsx
rename to src/app/templates/TopUpInput/TopUpInputHeader.tsx
index 0886e2e40c..efd2b3b064 100644
--- a/src/app/pages/Buy/Debit/Utorg/components/TopUpInput/TopUpInputHeader/TopUpInputHeader.tsx
+++ b/src/app/templates/TopUpInput/TopUpInputHeader.tsx
@@ -10,10 +10,11 @@ import { emptyFn } from 'app/utils/function.utils';
 import { toLocalFormat, T, t } from 'lib/i18n';
 import { PopperRenderProps } from 'lib/ui/Popper';
 
-import { StaticCurrencyImage } from '../StaticCurrencyImage/StaticCurrencyImage';
-import { TopUpInputProps } from '../TopUpInput.props';
+import { StaticCurrencyImage } from './StaticCurrencyImage';
+import { TopUpInputPropsBase } from './types';
+import { getProperNetworkFullName } from './utils';
 
-interface Props extends PopperRenderProps, TopUpInputProps {
+interface Props extends PopperRenderProps, TopUpInputPropsBase {
   searchString: string;
   onSearchChange: (e: ChangeEvent<HTMLInputElement>) => void;
 }
@@ -21,7 +22,8 @@ interface Props extends PopperRenderProps, TopUpInputProps {
 export const TopUpInputHeader = forwardRef<HTMLDivElement, Props>(
   (
     {
-      currencyName,
+      currenciesList,
+      currency,
       amount,
       label,
       readOnly,
@@ -29,14 +31,13 @@ export const TopUpInputHeader = forwardRef<HTMLDivElement, Props>(
       searchString,
       toggleOpened,
       amountInputDisabled,
-      isDefaultUahIcon,
       minAmount,
       maxAmount,
       isMinAmountError,
       isMaxAmountError,
       isInsufficientTezBalanceError,
       isSearchable = false,
-      singleToken = false,
+      fitIcons,
       onAmountChange = emptyFn,
       onSearchChange
     },
@@ -71,6 +72,8 @@ export const TopUpInputHeader = forwardRef<HTMLDivElement, Props>(
       onAmountChange(newValue);
     };
 
+    const singleToken = currenciesList.length < 2;
+
     return (
       <div className="w-full text-gray-700">
         <div className="w-full flex mb-1 items-center justify-between">
@@ -78,7 +81,7 @@ export const TopUpInputHeader = forwardRef<HTMLDivElement, Props>(
           {minAmount && !opened && (
             <p className={getSmallErrorText(isMinAmountError)} style={{ marginBottom: -10 }}>
               <T id="min" /> <span className={classNames(minAmountErrorClassName, 'text-sm')}>{' ' + minAmount}</span>{' '}
-              <span className={classNames(minAmountErrorClassName, 'text-xs')}>{currencyName}</span>
+              <span className={classNames(minAmountErrorClassName, 'text-xs')}>{currency.code}</span>
             </p>
           )}
         </div>
@@ -122,17 +125,20 @@ export const TopUpInputHeader = forwardRef<HTMLDivElement, Props>(
               onClick={singleToken ? undefined : toggleOpened}
             >
               <StaticCurrencyImage
-                currencyName={currencyName}
-                isDefaultUahIcon={isDefaultUahIcon}
-                style={{
-                  borderRadius: '50%',
-                  width: 32,
-                  height: 32
-                }}
+                currencyCode={currency.code}
+                isFiat={Boolean(currency.network)}
+                imageSrc={currency.icon}
+                fitImg={fitIcons}
               />
               <div className="flex flex-col ml-2 text-left whitespace-nowrap">
                 <span className="text-gray-700 font-normal text-lg overflow-ellipsis overflow-hidden w-16">
-                  {currencyName}
+                  {currency.code}
+                </span>
+                <span
+                  className="text-indigo-500 font-medium overflow-ellipsis overflow-hidden w-12"
+                  style={{ fontSize: 11 }}
+                >
+                  {currency.network?.shortName ?? getProperNetworkFullName(currency)}
                 </span>
               </div>
 
@@ -187,7 +193,7 @@ export const TopUpInputHeader = forwardRef<HTMLDivElement, Props>(
             isInsufficientTezBalanceError={isInsufficientTezBalanceError}
             isMaxAmountError={isMaxAmountError}
             maxAmount={maxAmount}
-            coin={currencyName}
+            coin={currency.code}
           />
         )}
       </div>
diff --git a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.tsx b/src/app/templates/TopUpInput/index.tsx
similarity index 68%
rename from src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.tsx
rename to src/app/templates/TopUpInput/index.tsx
index 2c2f2be9f2..d3da23b796 100644
--- a/src/app/pages/Buy/Crypto/Exolix/components/TopUpInput/TopUpInput.tsx
+++ b/src/app/templates/TopUpInput/index.tsx
@@ -1,33 +1,20 @@
-import React, { FC } from 'react';
+import React from 'react';
 
 import { Modifier } from '@popperjs/core';
 import classNames from 'clsx';
 
 import Popper from 'lib/ui/Popper';
 
-import { useFilteredCurrencies } from '../../hooks/useFilteredCurrencies.hook';
-import { CurrenciesMenu } from './CurrenciesMenu/CurrenciesMenu';
-import { TopUpInputProps } from './TopUpInput.props';
-import { TopUpInputHeader } from './TopUpInputHeader/TopUpInputHeader';
+import { CurrenciesMenu } from './CurrenciesMenu';
+import { TopUpInputHeader } from './TopUpInputHeader';
+import { TopUpInputPropsGeneric, CurrencyBase, TopUpInputPropsBase } from './types';
+import { useFilteredCurrencies } from './utils';
 
-const sameWidthModifiers: Array<Modifier<string, any>> = [
-  {
-    name: 'sameWidth',
-    enabled: true,
-    phase: 'beforeWrite',
-    requires: ['computeStyles'],
-    fn: ({ state }) => {
-      state.styles.popper.width = `${state.rects.reference.width}px`;
-    },
-    effect: ({ state }) => {
-      state.elements.popper.style.width = `${(state.elements.reference as any).offsetWidth}px`;
-      return () => {};
-    }
-  }
-];
+export type { CurrencyToken } from './types';
 
-export const TopUpInput: FC<TopUpInputProps> = props => {
-  const { currency, currenciesList, setCurrency, className, isCurrenciesLoading } = props;
+export const TopUpInput = <C extends CurrencyBase>(_props: TopUpInputPropsGeneric<C>) => {
+  const props = _props as unknown as TopUpInputPropsBase;
+  const { currency, currenciesList, isCurrenciesLoading, fitIcons, className, onCurrencySelect } = props;
 
   const { filteredCurrencies, searchValue, setSearchValue } = useFilteredCurrencies(currenciesList);
 
@@ -44,8 +31,9 @@ export const TopUpInput: FC<TopUpInputProps> = props => {
             options={filteredCurrencies}
             isLoading={isCurrenciesLoading}
             opened={opened}
+            fitIcons={fitIcons}
             setOpened={setOpened}
-            onChange={currency => setCurrency(currency)}
+            onChange={onCurrencySelect}
           />
         )}
       >
@@ -64,3 +52,19 @@ export const TopUpInput: FC<TopUpInputProps> = props => {
     </div>
   );
 };
+
+const sameWidthModifiers: Modifier<string, any>[] = [
+  {
+    name: 'sameWidth',
+    enabled: true,
+    phase: 'beforeWrite',
+    requires: ['computeStyles'],
+    fn: ({ state }) => {
+      state.styles.popper.width = `${state.rects.reference.width}px`;
+    },
+    effect: ({ state }) => {
+      state.elements.popper.style.width = `${(state.elements.reference as any).offsetWidth}px`;
+      return () => {};
+    }
+  }
+];
diff --git a/src/app/templates/TopUpInput/types.ts b/src/app/templates/TopUpInput/types.ts
new file mode 100644
index 0000000000..58c7123015
--- /dev/null
+++ b/src/app/templates/TopUpInput/types.ts
@@ -0,0 +1,39 @@
+import { ReactNode } from 'react';
+
+export interface CurrencyBase {
+  code: string;
+  name?: string;
+  icon?: string;
+  fitIcon?: boolean;
+  network?: {
+    code: string;
+    fullName: string;
+    shortName?: string | null;
+  };
+}
+
+export type CurrencyToken = WithRequired<CurrencyBase, 'network'>;
+
+export type CurrencyFiat = Omit<CurrencyBase, 'network'>;
+
+export interface TopUpInputPropsGeneric<C extends CurrencyBase> {
+  label: ReactNode;
+  currency: C;
+  currenciesList: C[];
+  onCurrencySelect?: (value: C) => void;
+  readOnly?: boolean;
+  amountInputDisabled?: boolean;
+  minAmount?: string;
+  maxAmount?: string;
+  amount?: number;
+  onAmountChange?: (value?: number) => void;
+  isCurrenciesLoading?: boolean;
+  isSearchable?: boolean;
+  isMinAmountError?: boolean;
+  isMaxAmountError?: boolean;
+  isInsufficientTezBalanceError?: boolean;
+  fitIcons?: boolean;
+  className?: string;
+}
+
+export type TopUpInputPropsBase = TopUpInputPropsGeneric<CurrencyBase>;
diff --git a/src/app/pages/Buy/Crypto/Exolix/hooks/useFilteredCurrencies.hook.ts b/src/app/templates/TopUpInput/utils.ts
similarity index 50%
rename from src/app/pages/Buy/Crypto/Exolix/hooks/useFilteredCurrencies.hook.ts
rename to src/app/templates/TopUpInput/utils.ts
index c412108578..d5537f9ca9 100644
--- a/src/app/pages/Buy/Crypto/Exolix/hooks/useFilteredCurrencies.hook.ts
+++ b/src/app/templates/TopUpInput/utils.ts
@@ -2,21 +2,28 @@ import { useMemo, useState } from 'react';
 
 import { useDebounce } from 'use-debounce';
 
-import { CurrencyInterface } from '../exolix.interface';
+import { CurrencyBase } from './types';
 
-export const useFilteredCurrencies = (currencies: CurrencyInterface[]) => {
+export const getProperNetworkFullName = (currency?: CurrencyBase) => {
+  if (currency == null || !currency.network?.fullName) return '';
+  const { fullName: networkFullName } = currency.network;
+
+  return currency.name === networkFullName ? networkFullName + ' Mainnet' : networkFullName;
+};
+
+export const useFilteredCurrencies = (currencies: CurrencyBase[]) => {
   const [searchValue, setSearchValue] = useState('');
   const [searchValueDebounced] = useDebounce(searchValue, 300);
 
-  const filteredCurrencies = useMemo<CurrencyInterface[]>(() => {
+  const filteredCurrencies = useMemo<CurrencyBase[]>(() => {
     if (searchValueDebounced) {
       const lowerCaseSearchValue = searchValueDebounced.toLowerCase();
-      const result: CurrencyInterface[] = [];
+      const result: CurrencyBase[] = [];
 
       for (const currency of currencies) {
         const { name, code } = currency;
 
-        if (name.toLowerCase().includes(lowerCaseSearchValue) || code.toLowerCase().includes(lowerCaseSearchValue)) {
+        if (name?.toLowerCase().includes(lowerCaseSearchValue) || code.toLowerCase().includes(lowerCaseSearchValue)) {
           result.push(currency);
         }
       }
diff --git a/src/app/templates/advertising/advertising-overlay/advertising-overlay.tsx b/src/app/templates/advertising/advertising-overlay/advertising-overlay.tsx
index 43047cc596..c30dd00b06 100644
--- a/src/app/templates/advertising/advertising-overlay/advertising-overlay.tsx
+++ b/src/app/templates/advertising/advertising-overlay/advertising-overlay.tsx
@@ -65,13 +65,14 @@ export const AdvertisingOverlay: FC = () => {
 
         <Button
           className={classNames(
-            'absolute top-0 right-3 p-3 hover:opacity-50',
-            'font-inter font-normal text-sm text-white self-end mt-3',
+            'absolute top-0 right-3 px-3 py-2 hover:opacity-50',
+            'font-inter font-medium text-sm text-white self-end mt-3',
+            'rounded bg-blue-500',
             popup ? 'mr-1' : 'mr-6'
           )}
           onClick={handleSkipPress}
         >
-          <T id="skip" />
+          <T id="skipAd" />
         </Button>
       </ContentContainer>
     </>
diff --git a/src/bs58check.d.ts b/src/bs58check.d.ts
deleted file mode 100644
index 0a8ae113e8..0000000000
--- a/src/bs58check.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'bs58check';
diff --git a/src/confirm.tsx b/src/confirm.tsx
index 1fa3d25a9a..8378935942 100644
--- a/src/confirm.tsx
+++ b/src/confirm.tsx
@@ -4,9 +4,6 @@ import React from 'react';
 
 import { createRoot } from 'react-dom/client';
 
-import 'lib/lock-up/run-checks';
-import 'lib/ledger/proxy/foreground';
-
 import { App } from 'app/App';
 import { WindowType } from 'app/env';
 
diff --git a/src/fullpage.tsx b/src/fullpage.tsx
index 83c83652d8..277c82c4e3 100644
--- a/src/fullpage.tsx
+++ b/src/fullpage.tsx
@@ -4,9 +4,6 @@ import React from 'react';
 
 import { createRoot } from 'react-dom/client';
 
-import 'lib/lock-up/run-checks';
-import 'lib/ledger/proxy/foreground';
-
 import { App } from 'app/App';
 import { WindowType } from 'app/env';
 
diff --git a/src/lib/analytics/index.ts b/src/lib/analytics/index.ts
index b96871eb75..7b93ee3553 100644
--- a/src/lib/analytics/index.ts
+++ b/src/lib/analytics/index.ts
@@ -8,3 +8,4 @@ export { useFormAnalytics } from './use-form-analytics.hook';
 export { usePageRouterAnalytics } from './use-page-router-analytics.hook';
 
 export type { TestIDProps } from './test-id.props';
+export { setTestID } from './test-id.utils';
diff --git a/src/lib/analytics/test-id.utils.ts b/src/lib/analytics/test-id.utils.ts
new file mode 100644
index 0000000000..0b551fcf74
--- /dev/null
+++ b/src/lib/analytics/test-id.utils.ts
@@ -0,0 +1,3 @@
+import { TestIDProps } from './test-id.props';
+
+export const setTestID = (testID?: TestIDProps['testID']) => ({ 'data-testid': testID });
diff --git a/src/lib/apis/utorg.ts b/src/lib/apis/utorg.ts
index 196dec89ba..78b1208053 100644
--- a/src/lib/apis/utorg.ts
+++ b/src/lib/apis/utorg.ts
@@ -5,7 +5,7 @@ enum currencyInfoType {
   FIAT = 'FIAT'
 }
 
-interface utorgCurrencyInfo {
+interface UtorgCurrencyInfo {
   currency: string;
   symbol: string;
   chain: string;
@@ -58,20 +58,24 @@ export const convertFiatAmountToXtz = (paymentAmount: number, fromCurrency: stri
     })
     .then(r => r.data.data);
 
-export const getExchangeRate = (paymentAmount: number, fromCurrency: string) => {
-  const finalPaymentAmount = paymentAmount === 0 ? 1 : paymentAmount;
+/**
+ * @returns Tezos to currency exchange rate
+ */
+export const getExchangeRate = async (inputAmount: number, fromCurrency: string) => {
+  if (!Number.isFinite(inputAmount) || inputAmount <= 0) return;
 
-  return convertFiatAmountToXtz(finalPaymentAmount, fromCurrency).then(
-    res => Math.round((res / finalPaymentAmount) * 10000) / 10000
-  );
+  return await convertFiatAmountToXtz(inputAmount, fromCurrency).then(res => inputAmount / res);
 };
-const getCurrenciesInfo = () => api.post<{ data: utorgCurrencyInfo[] }>('/settings/currency').then(r => r.data.data);
 
-export const getMinMaxExchangeValue = () =>
+const getCurrenciesInfo = () => api.post<{ data: UtorgCurrencyInfo[] }>('/settings/currency').then(r => r.data.data);
+
+export const getMinMaxExchangeValue = (currency: string) =>
   getCurrenciesInfo().then(currenciesInfo => {
-    const tezInfo = currenciesInfo.find(currencyInfo => currencyInfo.currency === 'XTZ')!;
+    const tezInfo = currenciesInfo.find(currencyInfo => currencyInfo.currency === currency);
+
+    if (tezInfo == null) throw new Error('Unknown Utorg currency');
 
-    return { minAmount: tezInfo.withdrawalMin, maxAmount: tezInfo.withdrawalMax };
+    return { minAmount: tezInfo.depositMin, maxAmount: tezInfo.depositMax };
   });
 
 export const getAvailableFiatCurrencies = () =>
diff --git a/src/lib/browser/index.ts b/src/lib/browser/index.ts
new file mode 100644
index 0000000000..71fec8670c
--- /dev/null
+++ b/src/lib/browser/index.ts
@@ -0,0 +1,8 @@
+import type { Browser, Storage } from 'webextension-polyfill';
+import browserDefault from 'webextension-polyfill';
+
+export { isBrowserVersionSafe } from './info';
+
+export const browser = browserDefault as Browser & {
+  storage: { session?: Storage.LocalStorageArea };
+};
diff --git a/src/lib/browser-info.ts b/src/lib/browser/info.ts
similarity index 74%
rename from src/lib/browser-info.ts
rename to src/lib/browser/info.ts
index 16d4f6cc8d..f8eb1954c0 100644
--- a/src/lib/browser-info.ts
+++ b/src/lib/browser/info.ts
@@ -7,7 +7,7 @@ const secureBrowserVersions: Record<string, number> = {
   Safari: 12
 };
 
-const browserInfo = (() => {
+const getBrowserInfo = () => {
   const ua = navigator.userAgent;
   let tem,
     M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
@@ -31,14 +31,19 @@ const browserInfo = (() => {
   }
 
   return { name: M[0], version: M[1] };
-})();
+};
+
+let browserVersionIsSafe: boolean | undefined;
 
-export const isSafeBrowserVersion = (() => {
+export const isBrowserVersionSafe = () => {
+  if (browserVersionIsSafe != null) return browserVersionIsSafe;
+
+  const browserInfo = getBrowserInfo();
   if (secureBrowserVersions.hasOwnProperty(browserInfo.name)) {
     if (parseInt(browserInfo.version) >= secureBrowserVersions[browserInfo.name]) {
-      return true;
+      return (browserVersionIsSafe = true);
     }
   }
 
-  return false;
-})();
+  return (browserVersionIsSafe = false);
+};
diff --git a/src/lib/env.ts b/src/lib/env.ts
index 9fa816cdfe..2f8ed38b72 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -1 +1,3 @@
 export const IS_DEV_ENV = process.env.NODE_ENV === 'development';
+
+export const BACKGROUND_IS_WORKER = process.env.BACKGROUND_IS_WORKER === 'true';
diff --git a/public/misc/token-logos/fallback.svg b/src/lib/icons/assets/fiat-fallback.svg
similarity index 100%
rename from public/misc/token-logos/fallback.svg
rename to src/lib/icons/assets/fiat-fallback.svg
diff --git a/src/lib/icons/assets/token-fallback.png b/src/lib/icons/assets/token-fallback.png
new file mode 100644
index 0000000000000000000000000000000000000000..66a594509986c1dcee017243e0d69aae79a176dc
GIT binary patch
literal 15838
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%0DRPafI9NF~VN)qyf
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

literal 0
HcmV?d00001

diff --git a/src/lib/icons/fiat.ts b/src/lib/icons/fiat.ts
new file mode 100644
index 0000000000..69dfe3253b
--- /dev/null
+++ b/src/lib/icons/fiat.ts
@@ -0,0 +1,8 @@
+import FallbackSrc from './assets/token-fallback.png';
+import SrcUAH from './fiat/uah.svg';
+
+export const FIAT_FALLBACK_ICON_SRC = FallbackSrc;
+
+export namespace FIAT_ICONS_SRC {
+  export const UAH = SrcUAH;
+}
diff --git a/public/misc/fiat-logos/uah.svg b/src/lib/icons/fiat/uah.svg
similarity index 100%
rename from public/misc/fiat-logos/uah.svg
rename to src/lib/icons/fiat/uah.svg
diff --git a/src/lib/icons/index.ts b/src/lib/icons/index.ts
index 40a6276528..30cd63c290 100644
--- a/src/lib/icons/index.ts
+++ b/src/lib/icons/index.ts
@@ -1,3 +1,6 @@
+export { FIAT_FALLBACK_ICON_SRC, FIAT_ICONS_SRC } from './fiat';
+export { TOKEN_FALLBACK_ICON_SRC, TOKENS_ICONS_SRC } from './tokens';
+
 export { ReactComponent as AlertTriangleIcon } from './assets/alert-triangle.svg';
 export { ReactComponent as ArrowRightIcon } from './assets/arrow-right.svg';
 export { ReactComponent as BellIcon } from './assets/bell.svg';
diff --git a/src/lib/icons/tokens.ts b/src/lib/icons/tokens.ts
new file mode 100644
index 0000000000..6b497b6b28
--- /dev/null
+++ b/src/lib/icons/tokens.ts
@@ -0,0 +1,9 @@
+import browser from 'webextension-polyfill';
+
+import FallbackSrc from './assets/token-fallback.png';
+
+export const TOKEN_FALLBACK_ICON_SRC = FallbackSrc;
+
+export namespace TOKENS_ICONS_SRC {
+  export const TEZ = browser.runtime.getURL('misc/token-logos/tez.svg');
+}
diff --git a/src/lib/image-uri.ts b/src/lib/image-uri.ts
index 043ed41f5a..d22da6c6c9 100644
--- a/src/lib/image-uri.ts
+++ b/src/lib/image-uri.ts
@@ -1,27 +1,55 @@
+import type { AssetMetadata } from 'lib/temple/metadata';
+
+type TcInfraMediaSize = 'small' | 'medium' | 'large';
+
 const MEDIA_HOST = 'https://static.tcinfra.net';
-const MEDIA_SIZE = 'small';
+const DEFAULT_MEDIA_SIZE: TcInfraMediaSize = 'small';
 
-export const formatAssetUri = (url = '') => {
-  if (url.startsWith('ipfs://')) {
-    return `${MEDIA_HOST}/media/${MEDIA_SIZE}/ipfs/${url.substring(7)}`;
-  }
+const formatAssetUriToAllSizes = (url?: string, includeLarge = false) => {
+  if (!url) return [];
 
-  if (url.startsWith('http')) {
-    return `${MEDIA_HOST}/media/${MEDIA_SIZE}/web/${url.replace(/^https?:\/\//, '')}`;
+  if (url.startsWith('ipfs://') || url.startsWith('http'))
+    return [
+      includeLarge ? formatTcInfraImgUri(url, 'large') : undefined,
+      includeLarge ? formatTcInfraImgUri(url, 'medium') : undefined,
+      formatTcInfraImgUri(url, 'small')
+    ];
+
+  if (url.startsWith('data:image/') || url.startsWith('chrome-extension') || url.startsWith('moz-extension')) {
+    return [url];
   }
 
-  if (url.startsWith('chrome-extension')) {
-    return url;
+  return [];
+};
+
+export { formatAssetUriToAllSizes as buildTokenIconURLs };
+
+export const buildCollectibleImageURLs = (assetSlug: string, metadata?: AssetMetadata | null, includeLarge = false) => {
+  if (metadata == null) return formatObjktSmallAssetUri(assetSlug);
+
+  return [
+    formatObjktSmallAssetUri(assetSlug),
+    ...formatAssetUriToAllSizes(metadata.displayUri, includeLarge),
+    ...formatAssetUriToAllSizes(metadata.artifactUri, includeLarge),
+    ...formatAssetUriToAllSizes(metadata.thumbnailUri, includeLarge)
+  ];
+};
+
+const formatTcInfraImgUri = (url?: string, size: TcInfraMediaSize = DEFAULT_MEDIA_SIZE) => {
+  if (!url) return;
+
+  if (url.startsWith('ipfs://')) {
+    return `${MEDIA_HOST}/media/${size}/ipfs/${url.substring(7)}`;
   }
 
-  if (url.startsWith('moz-extension')) {
-    return url;
+  if (url.startsWith('http')) {
+    return `${MEDIA_HOST}/media/${size}/web/${url.replace(/^https?:\/\//, '')}`;
   }
 
-  return '';
+  return;
 };
 
-export const formatObjktSmallAssetUri = (assetSlug: string) => {
+const formatObjktSmallAssetUri = (assetSlug: string) => {
   const [address, id] = assetSlug.split('_');
 
   return `https://assets.objkt.media/file/assets-003/${address}/${id}/thumb288`;
diff --git a/src/lib/intercom/client.ts b/src/lib/intercom/client.ts
index eb3ca06c8d..0286fc6207 100644
--- a/src/lib/intercom/client.ts
+++ b/src/lib/intercom/client.ts
@@ -6,9 +6,10 @@ import { MessageType, RequestMessage } from './types';
 export class IntercomClient {
   private port: Runtime.Port;
   private reqId: number;
+  private subscribers: ((data: any) => void)[] = [];
 
   constructor() {
-    this.port = browser.runtime.connect();
+    this.port = this.buildPort();
     this.reqId = 0;
   }
 
@@ -46,14 +47,12 @@ export class IntercomClient {
    * Allows to subscribe to notifications channel from background process
    */
   subscribe(callback: (data: any) => void) {
-    const listener = (msg: any) => {
-      if (msg?.type === MessageType.Sub) {
-        callback(msg.data);
-      }
-    };
+    this.subscribers.push(callback);
 
-    this.port.onMessage.addListener(listener);
-    return () => this.port.onMessage.removeListener(listener);
+    return () => {
+      const index = this.subscribers.findIndex(callback);
+      if (index > -1) this.subscribers.splice(index, 1);
+    };
   }
 
   destroy() {
@@ -63,4 +62,26 @@ export class IntercomClient {
   private send(msg: RequestMessage) {
     this.port.postMessage(msg);
   }
+
+  private onMessage(message: any) {
+    if (message?.type !== MessageType.Sub) return;
+
+    for (const subscriber of this.subscribers) {
+      try {
+        subscriber(message.data);
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  }
+
+  private buildPort() {
+    const port = browser.runtime.connect({ name: 'INTERCOM' });
+    port.onMessage.addListener(this.onMessage.bind(this));
+    port.onDisconnect.addListener(() => {
+      this.port = this.buildPort();
+    });
+
+    return port;
+  }
 }
diff --git a/src/lib/intercom/server.ts b/src/lib/intercom/server.ts
index 5a46bb2c08..3aa116f598 100644
--- a/src/lib/intercom/server.ts
+++ b/src/lib/intercom/server.ts
@@ -11,6 +11,8 @@ export class IntercomServer {
 
   constructor() {
     browser.runtime.onConnect.addListener(port => {
+      if (port.name !== 'INTERCOM') return;
+
       this.addPort(port);
 
       port.onDisconnect.addListener(() => {
diff --git a/src/lib/ledger/proxy/foreground.ts b/src/lib/ledger/proxy/foreground.ts
index 2a7662de32..abcd51002e 100644
--- a/src/lib/ledger/proxy/foreground.ts
+++ b/src/lib/ledger/proxy/foreground.ts
@@ -2,11 +2,11 @@ import browser from 'webextension-polyfill';
 
 import { isPopupWindow } from 'app/env';
 import { getLedgerTransportType } from 'lib/temple/ledger';
+import { stringToUInt8Array } from 'lib/utils';
 
 import type { TempleLedgerSigner } from '../signer';
 import { TransportType } from '../types';
 import type { RequestMessage, ForegroundResponse, CreatorArguments } from './types';
-import { stringToUInt8Array } from './utils';
 
 let windowIsActive = document.hasFocus();
 
diff --git a/src/lib/ledger/proxy/signer.ts b/src/lib/ledger/proxy/signer.ts
index 3237457763..d68823c80e 100644
--- a/src/lib/ledger/proxy/signer.ts
+++ b/src/lib/ledger/proxy/signer.ts
@@ -2,6 +2,7 @@ import type { Signer } from '@taquito/taquito';
 import browser from 'webextension-polyfill';
 
 import { PublicError } from 'lib/temple/back/PublicError';
+import { uInt8ArrayToString } from 'lib/utils';
 
 import type {
   ProxiedMethodName,
@@ -11,7 +12,6 @@ import type {
   RequestMessageGeneral,
   ForegroundResponse
 } from './types';
-import { uInt8ArrayToString } from './utils';
 
 export class TempleLedgerSignerProxy implements Signer {
   private creatorArgs: CreatorArguments;
diff --git a/src/lib/ledger/proxy/utils.ts b/src/lib/ledger/proxy/utils.ts
deleted file mode 100644
index 498ad099e4..0000000000
--- a/src/lib/ledger/proxy/utils.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const uInt8ArrayToString = (ui8a: Uint8Array) => new TextDecoder('utf-8').decode(ui8a);
-
-export const stringToUInt8Array = (str: string) => new TextEncoder().encode(str);
diff --git a/src/lib/temple/activity-new/utils.ts b/src/lib/temple/activity-new/utils.ts
index 2ebc23f4b6..b8ea628f7d 100644
--- a/src/lib/temple/activity-new/utils.ts
+++ b/src/lib/temple/activity-new/utils.ts
@@ -8,6 +8,7 @@ import {
   isTzktOperParam_LiquidityBaking,
   ParameterFa2
 } from 'lib/apis/tzkt/utils';
+import { isTruthy } from 'lib/utils';
 
 import type {
   OperationsGroup,
@@ -37,9 +38,7 @@ export function operationsGroupToActivity({ hash, operations }: OperationsGroup,
 }
 
 function reduceTzktOperations(operations: TzktOperation[], address: string): ActivityOperation[] {
-  const reducedOperations = operations
-    .map(op => reduceOneTzktOperation(op, address))
-    .filter(Boolean) as ActivityOperation[];
+  const reducedOperations = operations.map(op => reduceOneTzktOperation(op, address)).filter(isTruthy);
 
   return reducedOperations;
 }
diff --git a/src/lib/temple/back/actions.ts b/src/lib/temple/back/actions.ts
index fb08aa4413..413bcbac0e 100644
--- a/src/lib/temple/back/actions.ts
+++ b/src/lib/temple/back/actions.ts
@@ -9,7 +9,19 @@ import {
 } from '@temple-wallet/dapp/dist/types';
 import browser, { Runtime } from 'webextension-polyfill';
 
+import { BACKGROUND_IS_WORKER } from 'lib/env';
 import { addLocalOperation } from 'lib/temple/activity';
+import * as Beacon from 'lib/temple/beacon';
+import { loadChainId } from 'lib/temple/helpers';
+import {
+  TempleState,
+  TempleMessageType,
+  TempleRequest,
+  TempleSettings,
+  TempleSharedStorageKey
+} from 'lib/temple/types';
+import { createQueue } from 'lib/utils';
+
 import {
   getCurrentPermission,
   requestPermission,
@@ -18,9 +30,10 @@ import {
   requestBroadcast,
   getAllDApps,
   removeDApp
-} from 'lib/temple/back/dapp';
-import { intercom } from 'lib/temple/back/defaults';
-import { buildFinalOpParmas, dryRunOpParams } from 'lib/temple/back/dryrun';
+} from './dapp';
+import { intercom } from './defaults';
+import type { DryRunResult } from './dryrun';
+import { buildFinalOpParmas, dryRunOpParams } from './dryrun';
 import {
   toFront,
   store,
@@ -31,24 +44,13 @@ import {
   settingsUpdated,
   withInited,
   withUnlocked
-} from 'lib/temple/back/store';
-import { Vault } from 'lib/temple/back/vault';
-import * as Beacon from 'lib/temple/beacon';
-import { loadChainId } from 'lib/temple/helpers';
-import {
-  TempleState,
-  TempleMessageType,
-  TempleRequest,
-  TempleSettings,
-  TempleSharedStorageKey
-} from 'lib/temple/types';
-import { createQueue } from 'lib/utils';
-
-import type { DryRunResult } from './dryrun';
+} from './store';
+import { Vault } from './vault';
 
 const ACCOUNT_NAME_PATTERN = /^.{0,16}$/;
 const AUTODECLINE_AFTER = 60_000;
 const BEACON_ID = `temple_wallet_${browser.runtime.id}`;
+let initLocked = false;
 
 const enqueueDApp = createQueue();
 const enqueueUnlock = createQueue();
@@ -56,12 +58,18 @@ const enqueueUnlock = createQueue();
 export async function init() {
   const vaultExist = await Vault.isExist();
   inited(vaultExist);
+
+  if (initLocked) {
+    initLocked = false;
+    locked();
+  }
 }
 
 export async function getFrontState(): Promise<TempleState> {
   const state = store.getState();
   if (state.inited) {
-    return toFront(state);
+    if (BACKGROUND_IS_WORKER) return await enqueueUnlock(async () => toFront(store.getState()));
+    else return toFront(state);
   } else {
     await new Promise(r => setTimeout(r, 10));
     return getFrontState();
@@ -88,8 +96,10 @@ export function registerNewWallet(password: string, mnemonic?: string) {
   });
 }
 
-export function lock() {
-  return withInited(async () => {
+export async function lock() {
+  if (!store.getState().inited) initLocked = true;
+  if (BACKGROUND_IS_WORKER) await Vault.forgetSession();
+  return withInited(() => {
     locked();
   });
 }
@@ -97,7 +107,7 @@ export function lock() {
 export function unlock(password: string) {
   return withInited(() =>
     enqueueUnlock(async () => {
-      const vault = await Vault.setup(password);
+      const vault = await Vault.setup(password, BACKGROUND_IS_WORKER);
       const accounts = await vault.fetchAccounts();
       const settings = await vault.fetchSettings();
       unlocked({ vault, accounts, settings });
@@ -105,6 +115,16 @@ export function unlock(password: string) {
   );
 }
 
+export async function unlockFromSession() {
+  await enqueueUnlock(async () => {
+    const vault = await Vault.recoverFromSession();
+    if (vault == null) return;
+    const accounts = await vault.fetchAccounts();
+    const settings = await vault.fetchSettings();
+    unlocked({ vault, accounts, settings });
+  });
+}
+
 export function createHDAccount(name?: string) {
   return withUnlocked(async ({ vault }) => {
     if (name) {
diff --git a/src/lib/temple/back/dapp.ts b/src/lib/temple/back/dapp.ts
index 45df8b861e..3ef1ac4666 100644
--- a/src/lib/temple/back/dapp.ts
+++ b/src/lib/temple/back/dapp.ts
@@ -22,9 +22,6 @@ import { nanoid } from 'nanoid';
 import browser, { Runtime } from 'webextension-polyfill';
 
 import { addLocalOperation } from 'lib/temple/activity';
-import { intercom } from 'lib/temple/back/defaults';
-import { buildFinalOpParmas, dryRunOpParams } from 'lib/temple/back/dryrun';
-import { withUnlocked } from 'lib/temple/back/store';
 import * as Beacon from 'lib/temple/beacon';
 import { loadChainId, isAddressValid } from 'lib/temple/helpers';
 import { NETWORKS } from 'lib/temple/networks';
@@ -37,6 +34,10 @@ import {
   TempleNotification
 } from 'lib/temple/types';
 
+import { intercom } from './defaults';
+import { buildFinalOpParmas, dryRunOpParams } from './dryrun';
+import { withUnlocked } from './store';
+
 const CONFIRM_WINDOW_WIDTH = 380;
 const CONFIRM_WINDOW_HEIGHT = 632;
 const AUTODECLINE_AFTER = 120_000;
@@ -440,38 +441,7 @@ async function requestConfirm({ id, payload, onDecline, handleIntercomRequest }:
     }
   });
 
-  const isWin = (await browser.runtime.getPlatformInfo()).os === 'win';
-
-  let left = 0;
-  let top = 0;
-  try {
-    const lastFocused = await browser.windows.getLastFocused();
-    // Position window in top right corner of lastFocused window.
-
-    top = Math.round(lastFocused.top! + lastFocused.height! / 2 - CONFIRM_WINDOW_HEIGHT / 2);
-    left = Math.round(lastFocused.left! + lastFocused.width! / 2 - CONFIRM_WINDOW_WIDTH / 2);
-  } catch {
-    // The following properties are more than likely 0, due to being
-    // opened from the background chrome process for the extension that
-    // has no physical dimensions
-    const { screenX, screenY, outerWidth, outerHeight } = window;
-    top = Math.round(screenY + outerHeight / 2 - CONFIRM_WINDOW_HEIGHT / 2);
-    left = Math.round(screenX + outerWidth / 2 - CONFIRM_WINDOW_WIDTH / 2);
-  }
-
-  const confirmWin = await browser.windows.create({
-    type: 'popup',
-    url: browser.runtime.getURL(`confirm.html#?id=${id}`),
-    width: isWin ? CONFIRM_WINDOW_WIDTH + 16 : CONFIRM_WINDOW_WIDTH,
-    height: isWin ? CONFIRM_WINDOW_HEIGHT + 17 : CONFIRM_WINDOW_HEIGHT,
-    top: Math.max(top, 20),
-    left: Math.max(left, 20)
-  });
-
-  // Firefox currently ignores left/top for create, but it works for update
-  if (confirmWin.id && confirmWin.left !== left && confirmWin.state !== 'fullscreen') {
-    await browser.windows.update(confirmWin.id, { left, top });
-  }
+  const confirmWin = await createConfirmationWindow(id);
 
   const closeWindow = async () => {
     if (confirmWin.id) {
@@ -537,3 +507,44 @@ function isNetworkEquals(fNet: TempleDAppNetwork, sNet: TempleDAppNetwork) {
 function removeLastSlash(str: string) {
   return str.endsWith('/') ? str.slice(0, -1) : str;
 }
+
+async function createConfirmationWindow(confirmationId: string) {
+  const isWin = (await browser.runtime.getPlatformInfo()).os === 'win';
+
+  const height = isWin ? CONFIRM_WINDOW_HEIGHT + 17 : CONFIRM_WINDOW_HEIGHT;
+  const width = isWin ? CONFIRM_WINDOW_WIDTH + 16 : CONFIRM_WINDOW_WIDTH;
+
+  const [top, left] = (await getCenterPositionForWindow(width, height)) || [];
+
+  const options: browser.Windows.CreateCreateDataType = {
+    type: 'popup',
+    url: browser.runtime.getURL(`confirm.html#?id=${confirmationId}`),
+    width,
+    height
+  };
+
+  try {
+    /* Trying, because must have 50% of window in a viewport. Otherwise, error thrown. */
+    const confirmWin = await browser.windows.create({ ...options, top, left });
+
+    // Firefox currently ignores left/top for create, but it works for update
+    if (left != null && confirmWin.id && confirmWin.state !== 'fullscreen' && confirmWin.left !== left)
+      await browser.windows.update(confirmWin.id, { left, top }).catch(() => void 0);
+
+    return confirmWin;
+  } catch {
+    return await browser.windows.create(options);
+  }
+}
+
+/** Position window in the center of lastFocused window */
+async function getCenterPositionForWindow(width: number, height: number): Promise<[number, number] | undefined> {
+  const lastFocused = await browser.windows.getLastFocused().catch(() => void 0);
+
+  if (lastFocused == null || lastFocused.width == null) return;
+
+  const top = Math.round(lastFocused.top! + lastFocused.height! / 2 - height / 2);
+  const left = Math.round(lastFocused.left! + lastFocused.width! / 2 - width / 2);
+
+  return [top, left];
+}
diff --git a/src/lib/temple/back/ledger.ts b/src/lib/temple/back/ledger.ts
index 2d21e0a94a..d35ea58a3c 100644
--- a/src/lib/temple/back/ledger.ts
+++ b/src/lib/temple/back/ledger.ts
@@ -1,9 +1,8 @@
+import { BACKGROUND_IS_WORKER } from 'lib/env';
 import type { TransportType, CreatorArgumentsTuple } from 'lib/ledger/types';
 
-const MANIFEST_VERSION = (process.env.MANIFEST_VERSION as '3' | '2' | undefined) || '2';
-
 export const createLedgerSigner = async (...args: CreatorArgumentsTuple) => {
-  if (MANIFEST_VERSION === '3') return createLedgerSignerProxy(...args);
+  if (BACKGROUND_IS_WORKER) return createLedgerSignerProxy(...args);
 
   const transportType = (await import('lib/temple/ledger')).getLedgerTransportType();
 
diff --git a/src/lib/temple/back/main.ts b/src/lib/temple/back/main.ts
index 2311e59b4c..3c01bbec06 100644
--- a/src/lib/temple/back/main.ts
+++ b/src/lib/temple/back/main.ts
@@ -1,24 +1,34 @@
 import { Runtime } from 'webextension-polyfill';
 
-import * as Actions from 'lib/temple/back/actions';
-import * as Analytics from 'lib/temple/back/analytics';
-import { intercom } from 'lib/temple/back/defaults';
-import { store, toFront } from 'lib/temple/back/store';
+import { BACKGROUND_IS_WORKER } from 'lib/env';
+import { encodeMessage, encryptMessage, getSenderId, MessageType, Response } from 'lib/temple/beacon';
 import { TempleMessageType, TempleRequest, TempleResponse } from 'lib/temple/types';
 
-import { encodeMessage, encryptMessage, getSenderId, MessageType, Response } from '../beacon';
+import * as Actions from './actions';
+import * as Analytics from './analytics';
+import { intercom } from './defaults';
+import { store, toFront } from './store';
 
 const frontStore = store.map(toFront);
 
-export async function start() {
-  intercom.onRequest(processRequest);
+export const start = async () => {
+  intercom.onRequest(processRequestWithErrorsLogged);
   await Actions.init();
+
+  if (BACKGROUND_IS_WORKER) await Actions.unlockFromSession().catch(e => console.error(e));
+
   frontStore.watch(() => {
     intercom.broadcast({ type: TempleMessageType.StateUpdated });
   });
-}
+};
+
+const processRequestWithErrorsLogged = (...args: Parameters<typeof processRequest>) =>
+  processRequest(...args).catch(error => {
+    console.error(error);
+    throw error;
+  });
 
-async function processRequest(req: TempleRequest, port: Runtime.Port): Promise<TempleResponse | void> {
+const processRequest = async (req: TempleRequest, port: Runtime.Port): Promise<TempleResponse | void> => {
   switch (req?.type) {
     case TempleMessageType.SendTrackEventRequest:
       await Analytics.trackEvent(req);
@@ -228,4 +238,4 @@ async function processRequest(req: TempleRequest, port: Runtime.Port): Promise<T
       }
       break;
   }
-}
+};
diff --git a/src/lib/temple/back/store.ts b/src/lib/temple/back/store.ts
index 3ed2e909e0..bc31c7fdc3 100644
--- a/src/lib/temple/back/store.ts
+++ b/src/lib/temple/back/store.ts
@@ -1,9 +1,10 @@
 import { createStore, createEvent } from 'effector';
 
-import { Vault } from 'lib/temple/back/vault';
 import { NETWORKS } from 'lib/temple/networks';
 import { TempleState, TempleStatus, TempleAccount, TempleSettings } from 'lib/temple/types';
 
+import { Vault } from './vault';
+
 interface StoreState extends TempleState {
   inited: boolean;
   vault: Vault | null;
diff --git a/src/lib/temple/back/helpers.ts b/src/lib/temple/back/vault/helpers.ts
similarity index 100%
rename from src/lib/temple/back/helpers.ts
rename to src/lib/temple/back/vault/helpers.ts
diff --git a/src/lib/temple/back/vault.ts b/src/lib/temple/back/vault/index.ts
similarity index 68%
rename from src/lib/temple/back/vault.ts
rename to src/lib/temple/back/vault/index.ts
index 11188bc03c..571f6a4154 100644
--- a/src/lib/temple/back/vault.ts
+++ b/src/lib/temple/back/vault/index.ts
@@ -1,24 +1,34 @@
 import { HttpResponseError } from '@taquito/http-utils';
 import { DerivationType } from '@taquito/ledger-signer';
 import { localForger } from '@taquito/local-forging';
-import { InMemorySigner } from '@taquito/signer';
 import { CompositeForger, RpcForger, Signer, TezosOperationError, TezosToolkit } from '@taquito/taquito';
 import * as TaquitoUtils from '@taquito/utils';
 import * as Bip39 from 'bip39';
-import * as Ed25519 from 'ed25519-hd-key';
-import { initialize, SecureCellSeal } from 'wasm-themis';
+import * as WasmThemis from 'wasm-themis';
 
 import { formatOpParamsBeforeSend, loadFastRpcClient, michelEncoder } from 'lib/temple/helpers';
 import * as Passworder from 'lib/temple/passworder';
 import { clearAsyncStorages } from 'lib/temple/reset';
-import { TempleAccount, TempleAccountType, TempleContact, TempleSettings } from 'lib/temple/types';
+import { TempleAccount, TempleAccountType, TempleSettings } from 'lib/temple/types';
 
-import { fetchMessage, transformHttpResponseError } from './helpers';
-import { createLedgerSigner } from './ledger';
-import { PublicError } from './PublicError';
+import { createLedgerSigner } from '../ledger';
+import { PublicError } from '../PublicError';
+import { transformHttpResponseError } from './helpers';
+import { MIGRATIONS } from './migrations';
+import {
+  seedToHDPrivateKey,
+  seedToPrivateKey,
+  deriveSeed,
+  generateCheck,
+  fetchNewAccountName,
+  concatAccount,
+  createMemorySigner,
+  getMainDerivationPath,
+  getPublicKeyAndHash,
+  withError
+} from './misc';
 import {
   encryptAndSaveMany,
-  encryptAndSaveManyLegacy,
   fetchAndDecryptOne,
   fetchAndDecryptOneLegacy,
   getPlain,
@@ -28,31 +38,21 @@ import {
   removeManyLegacy,
   savePlain
 } from './safe-storage';
+import * as SessionStore from './session-store';
+import {
+  checkStrgKey,
+  migrationLevelStrgKey,
+  mnemonicStrgKey,
+  accPrivKeyStrgKey,
+  accPubKeyStrgKey,
+  accountsStrgKey,
+  settingsStrgKey,
+  legacyMigrationLevelStrgKey
+} from './storage-keys';
 
 const TEMPLE_SYNC_PREFIX = 'templesync';
-const TEZOS_BIP44_COINTYPE = 1729;
-const STORAGE_KEY_PREFIX = 'vault';
 const DEFAULT_SETTINGS: TempleSettings = {};
-
-enum StorageEntity {
-  Check = 'check',
-  MigrationLevel = 'migration',
-  Mnemonic = 'mnemonic',
-  AccPrivKey = 'accprivkey',
-  AccPubKey = 'accpubkey',
-  Accounts = 'accounts',
-  Settings = 'settings',
-  LegacyMigrationLevel = 'mgrnlvl'
-}
-
-const checkStrgKey = createStorageKey(StorageEntity.Check);
-const migrationLevelStrgKey = createStorageKey(StorageEntity.MigrationLevel);
-const mnemonicStrgKey = createStorageKey(StorageEntity.Mnemonic);
-const accPrivKeyStrgKey = createDynamicStorageKey(StorageEntity.AccPrivKey);
-const accPubKeyStrgKey = createDynamicStorageKey(StorageEntity.AccPubKey);
-const accountsStrgKey = createStorageKey(StorageEntity.Accounts);
-const settingsStrgKey = createStorageKey(StorageEntity.Settings);
-const legacyMigrationLevelStrgKey = createStorageKey(StorageEntity.LegacyMigrationLevel);
+const libthemisWasmSrc = '/wasm/libthemis.wasm';
 
 export class Vault {
   static async isExist() {
@@ -62,15 +62,29 @@ export class Vault {
     return isStoredLegacy(checkStrgKey);
   }
 
-  static async setup(password: string) {
+  static async setup(password: string, saveSession = false) {
     return withError('Failed to unlock wallet', async () => {
       await Vault.runMigrations(password);
 
-      const passKey = await Vault.toValidPassKey(password);
+      const { passHash, passKey } = await Vault.toValidPassKey(password);
+
+      if (saveSession) await SessionStore.savePassHash(passHash);
+
       return new Vault(passKey);
     });
   }
 
+  static async recoverFromSession() {
+    const passHash = await SessionStore.getPassHash();
+    if (!passHash) return null;
+    const passKey = await Passworder.importKey(passHash);
+    return new Vault(passKey);
+  }
+
+  static forgetSession() {
+    return SessionStore.removePassHash();
+  }
+
   static async spawn(password: string, mnemonic?: string) {
     return withError('Failed to create wallet', async () => {
       if (!mnemonic) {
@@ -92,6 +106,8 @@ export class Vault {
 
       const passKey = await Passworder.generateKey(password);
 
+      await SessionStore.removePassHash();
+
       await clearAsyncStorages();
 
       await encryptAndSaveMany(
@@ -171,15 +187,15 @@ export class Vault {
   }
 
   static async revealMnemonic(password: string) {
-    const passKey = await Vault.toValidPassKey(password);
+    const { passKey } = await Vault.toValidPassKey(password);
     return withError('Failed to reveal seed phrase', () => fetchAndDecryptOne<string>(mnemonicStrgKey, passKey));
   }
 
   static async generateSyncPayload(password: string) {
     try {
-      await initialize();
+      await WasmThemis.initialize(libthemisWasmSrc);
     } catch {}
-    const passKey = await Vault.toValidPassKey(password);
+    const { passKey } = await Vault.toValidPassKey(password);
     return withError('Failed to generate sync payload', async () => {
       const [mnemonic, allAccounts] = await Promise.all([
         fetchAndDecryptOne<string>(mnemonicStrgKey, passKey),
@@ -191,7 +207,7 @@ export class Vault {
       const data = [mnemonic, hdAccounts.length];
 
       const payload = Uint8Array.from(Buffer.from(JSON.stringify(data)));
-      const cell = SecureCellSeal.withPassphrase(password);
+      const cell = WasmThemis.SecureCellSeal.withPassphrase(password);
       const encrypted = cell.encrypt(payload);
 
       return [TEMPLE_SYNC_PREFIX, encrypted].map(item => Buffer.from(item).toString('base64')).join('');
@@ -199,7 +215,7 @@ export class Vault {
   }
 
   static async revealPrivateKey(accPublicKeyHash: string, password: string) {
-    const passKey = await Vault.toValidPassKey(password);
+    const { passKey } = await Vault.toValidPassKey(password);
     return withError('Failed to reveal private key', async () => {
       const privateKeySeed = await fetchAndDecryptOne<string>(accPrivKeyStrgKey(accPublicKeyHash), passKey);
       const signer = await createMemorySigner(privateKeySeed);
@@ -208,7 +224,7 @@ export class Vault {
   }
 
   static async removeAccount(accPublicKeyHash: string, password: string) {
-    const passKey = await Vault.toValidPassKey(password);
+    const { passKey } = await Vault.toValidPassKey(password);
     return withError('Failed to remove account', async doThrow => {
       const allAccounts = await fetchAndDecryptOne<TempleAccount[]>(accountsStrgKey, passKey);
       const acc = allAccounts.find(a => a.publicKeyHash === accPublicKeyHash);
@@ -227,14 +243,15 @@ export class Vault {
 
   private static toValidPassKey(password: string) {
     return withError('Invalid password', async doThrow => {
-      const passKey = await Passworder.generateKey(password);
+      const passHash = await Passworder.generateHash(password);
+      const passKey = await Passworder.importKey(passHash);
       try {
         await fetchAndDecryptOne<any>(checkStrgKey, passKey);
       } catch (err: any) {
         console.log(err);
         doThrow();
       }
-      return passKey;
+      return { passHash, passKey };
     });
   }
 
@@ -545,198 +562,3 @@ export class Vault {
     }
   }
 }
-
-/**
- * Migrations
- *
- * -> -> ->
- */
-
-const MIGRATIONS = [
-  // [1] Fix derivation
-  async (password: string) => {
-    const passKey = await Passworder.generateKeyLegacy(password);
-
-    const [mnemonic, accounts] = await Promise.all([
-      fetchAndDecryptOneLegacy<string>(mnemonicStrgKey, passKey),
-      fetchAndDecryptOneLegacy<TempleAccount[]>(accountsStrgKey, passKey)
-    ]);
-    const migratedAccounts = accounts.map(acc =>
-      acc.type === TempleAccountType.HD
-        ? {
-            ...acc,
-            type: TempleAccountType.Imported
-          }
-        : acc
-    );
-
-    const seed = Bip39.mnemonicToSeedSync(mnemonic);
-    const hdAccIndex = 0;
-    const accPrivateKey = seedToHDPrivateKey(seed, hdAccIndex);
-    const [accPublicKey, accPublicKeyHash] = await getPublicKeyAndHash(accPrivateKey);
-
-    const newInitialAccount: TempleAccount = {
-      type: TempleAccountType.HD,
-      name: await fetchNewAccountName(accounts),
-      publicKeyHash: accPublicKeyHash,
-      hdIndex: hdAccIndex
-    };
-    const newAccounts = [newInitialAccount, ...migratedAccounts];
-
-    await encryptAndSaveManyLegacy(
-      [
-        [accPrivKeyStrgKey(accPublicKeyHash), accPrivateKey],
-        [accPubKeyStrgKey(accPublicKeyHash), accPublicKey],
-        [accountsStrgKey, newAccounts]
-      ],
-      passKey
-    );
-  },
-
-  // [2] Add hdIndex prop to HD Accounts
-  async (password: string) => {
-    const passKey = await Passworder.generateKeyLegacy(password);
-    const accounts = await fetchAndDecryptOneLegacy<TempleAccount[]>(accountsStrgKey, passKey);
-
-    let hdAccIndex = 0;
-    const newAccounts = accounts.map(acc =>
-      acc.type === TempleAccountType.HD ? { ...acc, hdIndex: hdAccIndex++ } : acc
-    );
-
-    await encryptAndSaveManyLegacy([[accountsStrgKey, newAccounts]], passKey);
-  },
-
-  // [3] Improve token managing flow
-  // Migrate from tokens{netId}: TempleToken[] + hiddenTokens{netId}: TempleToken[]
-  // to tokens{chainId}: TempleToken[]
-  async () => {
-    // The code base for this migration has been removed
-    // because it is no longer needed,
-    // but this migration is required for version compatibility.
-  },
-
-  // [4] Improve crypto security
-  // Migrate legacy crypto storage
-  // New crypto updates:
-  // - Use password hash in memory when unlocked(instead of plain password)
-  // - Wrap storage keys in sha256(instead of plain)
-  // - Concat storage values to bytes(instead of json)
-  // - Increase PBKDF rounds
-  async (password: string) => {
-    const legacyPassKey = await Passworder.generateKeyLegacy(password);
-
-    const fetchLegacySafe = async <T>(storageKey: string) => {
-      try {
-        return await fetchAndDecryptOneLegacy<T>(storageKey, legacyPassKey);
-      } catch {
-        return undefined;
-      }
-    };
-
-    const [mnemonic, accounts, settings] = await Promise.all([
-      fetchLegacySafe<string>(mnemonicStrgKey),
-      fetchLegacySafe<TempleAccount[]>(accountsStrgKey),
-      fetchLegacySafe<TempleSettings>(settingsStrgKey)
-    ]);
-
-    // Address book contacts migration
-    const contacts = await getPlain<TempleContact[]>('contacts');
-
-    const accountsStrgKeys = accounts!
-      .map(acc => [accPrivKeyStrgKey(acc.publicKeyHash), accPubKeyStrgKey(acc.publicKeyHash)])
-      .flat();
-
-    const accountsStrgValues = await Promise.all(accountsStrgKeys.map(fetchLegacySafe));
-
-    const toSave = [
-      [checkStrgKey, generateCheck()],
-      [mnemonicStrgKey, mnemonic],
-      [accountsStrgKey, accounts],
-      [settingsStrgKey, { ...settings, contacts }],
-      ...accountsStrgKeys.map((key, i) => [key, accountsStrgValues[i]])
-    ].filter(([_key, value]) => value !== undefined) as [string, any][];
-
-    // Save new storage items
-    const passKey = await Passworder.generateKey(password);
-    await encryptAndSaveMany(toSave, passKey);
-
-    // Remove old
-    await removeManyLegacy([...toSave.map(([key]) => key), 'contacts']);
-  }
-];
-
-/**
- * Misc
- */
-
-function generateCheck() {
-  return Bip39.generateMnemonic(128);
-}
-
-function concatAccount(current: TempleAccount[], newOne: TempleAccount) {
-  if (current.every(a => a.publicKeyHash !== newOne.publicKeyHash)) {
-    return [...current, newOne];
-  }
-
-  throw new PublicError('Account already exists');
-}
-
-type NewAccountName = 'defaultAccountName' | 'defaultManagedKTAccountName' | 'defaultWatchOnlyAccountName';
-
-function fetchNewAccountName(allAccounts: TempleAccount[], templateI18nKey: NewAccountName = 'defaultAccountName') {
-  return fetchMessage(templateI18nKey, String(allAccounts.length + 1));
-}
-
-async function getPublicKeyAndHash(privateKey: string) {
-  const signer = await createMemorySigner(privateKey);
-  return Promise.all([signer.publicKey(), signer.publicKeyHash()]);
-}
-
-async function createMemorySigner(privateKey: string, encPassword?: string) {
-  return InMemorySigner.fromSecretKey(privateKey, encPassword);
-}
-
-function seedToHDPrivateKey(seed: Buffer, hdAccIndex: number) {
-  return seedToPrivateKey(deriveSeed(seed, getMainDerivationPath(hdAccIndex)));
-}
-
-function getMainDerivationPath(accIndex: number) {
-  return `m/44'/${TEZOS_BIP44_COINTYPE}'/${accIndex}'/0'`;
-}
-
-function seedToPrivateKey(seed: Buffer) {
-  return TaquitoUtils.b58cencode(seed.slice(0, 32), TaquitoUtils.prefix.edsk2);
-}
-
-function deriveSeed(seed: Buffer, derivationPath: string) {
-  try {
-    const { key } = Ed25519.derivePath(derivationPath, seed.toString('hex'));
-    return key;
-  } catch (_err) {
-    throw new PublicError('Invalid derivation path');
-  }
-}
-
-function createStorageKey(id: StorageEntity) {
-  return combineStorageKey(STORAGE_KEY_PREFIX, id);
-}
-
-function createDynamicStorageKey(id: StorageEntity) {
-  const keyBase = combineStorageKey(STORAGE_KEY_PREFIX, id);
-  return (...subKeys: (number | string)[]) => combineStorageKey(keyBase, ...subKeys);
-}
-
-function combineStorageKey(...parts: (string | number)[]) {
-  return parts.join('_');
-}
-
-async function withError<T>(errMessage: string, factory: (doThrow: () => void) => Promise<T>) {
-  try {
-    return await factory(() => {
-      throw new Error('<stub>');
-    });
-  } catch (err: any) {
-    console.error(err);
-    throw err instanceof PublicError ? err : new PublicError(errMessage);
-  }
-}
diff --git a/src/lib/temple/back/vault/migrations.ts b/src/lib/temple/back/vault/migrations.ts
new file mode 100644
index 0000000000..27a5810b53
--- /dev/null
+++ b/src/lib/temple/back/vault/migrations.ts
@@ -0,0 +1,134 @@
+import * as Bip39 from 'bip39';
+
+import * as Passworder from 'lib/temple/passworder';
+import { TempleAccount, TempleAccountType, TempleContact, TempleSettings } from 'lib/temple/types';
+
+import { seedToHDPrivateKey, generateCheck, fetchNewAccountName, getPublicKeyAndHash } from './misc';
+import {
+  encryptAndSaveMany,
+  encryptAndSaveManyLegacy,
+  fetchAndDecryptOneLegacy,
+  getPlain,
+  removeManyLegacy
+} from './safe-storage';
+import {
+  checkStrgKey,
+  mnemonicStrgKey,
+  accPrivKeyStrgKey,
+  accPubKeyStrgKey,
+  accountsStrgKey,
+  settingsStrgKey
+} from './storage-keys';
+
+export const MIGRATIONS = [
+  // [1] Fix derivation
+  async (password: string) => {
+    const passKey = await Passworder.generateKeyLegacy(password);
+
+    const [mnemonic, accounts] = await Promise.all([
+      fetchAndDecryptOneLegacy<string>(mnemonicStrgKey, passKey),
+      fetchAndDecryptOneLegacy<TempleAccount[]>(accountsStrgKey, passKey)
+    ]);
+    const migratedAccounts = accounts.map(acc =>
+      acc.type === TempleAccountType.HD
+        ? {
+            ...acc,
+            type: TempleAccountType.Imported
+          }
+        : acc
+    );
+
+    const seed = Bip39.mnemonicToSeedSync(mnemonic);
+    const hdAccIndex = 0;
+    const accPrivateKey = seedToHDPrivateKey(seed, hdAccIndex);
+    const [accPublicKey, accPublicKeyHash] = await getPublicKeyAndHash(accPrivateKey);
+
+    const newInitialAccount: TempleAccount = {
+      type: TempleAccountType.HD,
+      name: await fetchNewAccountName(accounts),
+      publicKeyHash: accPublicKeyHash,
+      hdIndex: hdAccIndex
+    };
+    const newAccounts = [newInitialAccount, ...migratedAccounts];
+
+    await encryptAndSaveManyLegacy(
+      [
+        [accPrivKeyStrgKey(accPublicKeyHash), accPrivateKey],
+        [accPubKeyStrgKey(accPublicKeyHash), accPublicKey],
+        [accountsStrgKey, newAccounts]
+      ],
+      passKey
+    );
+  },
+
+  // [2] Add hdIndex prop to HD Accounts
+  async (password: string) => {
+    const passKey = await Passworder.generateKeyLegacy(password);
+    const accounts = await fetchAndDecryptOneLegacy<TempleAccount[]>(accountsStrgKey, passKey);
+
+    let hdAccIndex = 0;
+    const newAccounts = accounts.map(acc =>
+      acc.type === TempleAccountType.HD ? { ...acc, hdIndex: hdAccIndex++ } : acc
+    );
+
+    await encryptAndSaveManyLegacy([[accountsStrgKey, newAccounts]], passKey);
+  },
+
+  // [3] Improve token managing flow
+  // Migrate from tokens{netId}: TempleToken[] + hiddenTokens{netId}: TempleToken[]
+  // to tokens{chainId}: TempleToken[]
+  async () => {
+    // The code base for this migration has been removed
+    // because it is no longer needed,
+    // but this migration is required for version compatibility.
+  },
+
+  // [4] Improve crypto security
+  // Migrate legacy crypto storage
+  // New crypto updates:
+  // - Use password hash in memory when unlocked(instead of plain password)
+  // - Wrap storage keys in sha256(instead of plain)
+  // - Concat storage values to bytes(instead of json)
+  // - Increase PBKDF rounds
+  async (password: string) => {
+    const legacyPassKey = await Passworder.generateKeyLegacy(password);
+
+    const fetchLegacySafe = async <T>(storageKey: string) => {
+      try {
+        return await fetchAndDecryptOneLegacy<T>(storageKey, legacyPassKey);
+      } catch {
+        return undefined;
+      }
+    };
+
+    const [mnemonic, accounts, settings] = await Promise.all([
+      fetchLegacySafe<string>(mnemonicStrgKey),
+      fetchLegacySafe<TempleAccount[]>(accountsStrgKey),
+      fetchLegacySafe<TempleSettings>(settingsStrgKey)
+    ]);
+
+    // Address book contacts migration
+    const contacts = await getPlain<TempleContact[]>('contacts');
+
+    const accountsStrgKeys = accounts!
+      .map(acc => [accPrivKeyStrgKey(acc.publicKeyHash), accPubKeyStrgKey(acc.publicKeyHash)])
+      .flat();
+
+    const accountsStrgValues = await Promise.all(accountsStrgKeys.map(fetchLegacySafe));
+
+    const toSave = [
+      [checkStrgKey, generateCheck()],
+      [mnemonicStrgKey, mnemonic],
+      [accountsStrgKey, accounts],
+      [settingsStrgKey, { ...settings, contacts }],
+      ...accountsStrgKeys.map((key, i) => [key, accountsStrgValues[i]])
+    ].filter(([_key, value]) => value !== undefined) as [string, any][];
+
+    // Save new storage items
+    const passKey = await Passworder.generateKey(password);
+    await encryptAndSaveMany(toSave, passKey);
+
+    // Remove old
+    await removeManyLegacy([...toSave.map(([key]) => key), 'contacts']);
+  }
+];
diff --git a/src/lib/temple/back/vault/misc.ts b/src/lib/temple/back/vault/misc.ts
new file mode 100644
index 0000000000..9881ebe8ad
--- /dev/null
+++ b/src/lib/temple/back/vault/misc.ts
@@ -0,0 +1,73 @@
+import { InMemorySigner } from '@taquito/signer';
+import * as TaquitoUtils from '@taquito/utils';
+import * as Bip39 from 'bip39';
+import * as Ed25519 from 'ed25519-hd-key';
+
+import { TempleAccount } from 'lib/temple/types';
+
+import { PublicError } from '../PublicError';
+import { fetchMessage } from './helpers';
+
+const TEZOS_BIP44_COINTYPE = 1729;
+
+export function generateCheck() {
+  return Bip39.generateMnemonic(128);
+}
+
+export function concatAccount(current: TempleAccount[], newOne: TempleAccount) {
+  if (current.every(a => a.publicKeyHash !== newOne.publicKeyHash)) {
+    return [...current, newOne];
+  }
+
+  throw new PublicError('Account already exists');
+}
+
+type NewAccountName = 'defaultAccountName' | 'defaultManagedKTAccountName' | 'defaultWatchOnlyAccountName';
+
+export function fetchNewAccountName(
+  allAccounts: TempleAccount[],
+  templateI18nKey: NewAccountName = 'defaultAccountName'
+) {
+  return fetchMessage(templateI18nKey, String(allAccounts.length + 1));
+}
+
+export async function getPublicKeyAndHash(privateKey: string) {
+  const signer = await createMemorySigner(privateKey);
+  return Promise.all([signer.publicKey(), signer.publicKeyHash()]);
+}
+
+export async function createMemorySigner(privateKey: string, encPassword?: string) {
+  return InMemorySigner.fromSecretKey(privateKey, encPassword);
+}
+
+export function seedToHDPrivateKey(seed: Buffer, hdAccIndex: number) {
+  return seedToPrivateKey(deriveSeed(seed, getMainDerivationPath(hdAccIndex)));
+}
+
+export function getMainDerivationPath(accIndex: number) {
+  return `m/44'/${TEZOS_BIP44_COINTYPE}'/${accIndex}'/0'`;
+}
+
+export function seedToPrivateKey(seed: Buffer) {
+  return TaquitoUtils.b58cencode(seed.slice(0, 32), TaquitoUtils.prefix.edsk2);
+}
+
+export function deriveSeed(seed: Buffer, derivationPath: string) {
+  try {
+    const { key } = Ed25519.derivePath(derivationPath, seed.toString('hex'));
+    return key;
+  } catch (_err) {
+    throw new PublicError('Invalid derivation path');
+  }
+}
+
+export async function withError<T>(errMessage: string, factory: (doThrow: () => void) => Promise<T>) {
+  try {
+    return await factory(() => {
+      throw new Error('<stub>');
+    });
+  } catch (err: any) {
+    console.error(err);
+    throw err instanceof PublicError ? err : new PublicError(errMessage);
+  }
+}
diff --git a/src/lib/temple/back/safe-storage.test.ts b/src/lib/temple/back/vault/safe-storage.test.ts
similarity index 100%
rename from src/lib/temple/back/safe-storage.test.ts
rename to src/lib/temple/back/vault/safe-storage.test.ts
diff --git a/src/lib/temple/back/safe-storage.ts b/src/lib/temple/back/vault/safe-storage.ts
similarity index 100%
rename from src/lib/temple/back/safe-storage.ts
rename to src/lib/temple/back/vault/safe-storage.ts
diff --git a/src/lib/temple/back/vault/session-store.ts b/src/lib/temple/back/vault/session-store.ts
new file mode 100644
index 0000000000..e0ef66c0a0
--- /dev/null
+++ b/src/lib/temple/back/vault/session-store.ts
@@ -0,0 +1,41 @@
+import { browser } from 'lib/browser';
+import { arrayBufferToString, stringToArrayBuffer } from 'lib/utils';
+
+const PASS_HASH_STORE_KEY = '@Vault:session.passHash';
+
+export const savePassHash = async (passHashBuffer: ArrayBuffer) => {
+  if (browser.storage.session == null) return;
+
+  try {
+    const passHashStr = arrayBufferToString(passHashBuffer);
+    await browser.storage.session.set({ [PASS_HASH_STORE_KEY]: passHashStr });
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+export const getPassHash = async () => {
+  if (browser.storage.session == null) return;
+
+  try {
+    const { [PASS_HASH_STORE_KEY]: passHash }: { [PASS_HASH_STORE_KEY]?: string } = await browser.storage.session.get(
+      PASS_HASH_STORE_KEY
+    );
+
+    if (passHash) return stringToArrayBuffer(passHash);
+  } catch (error) {
+    console.error(error);
+  }
+
+  return;
+};
+
+export const removePassHash = async () => {
+  if (browser.storage.session == null) return;
+
+  try {
+    await browser.storage.session.remove(PASS_HASH_STORE_KEY);
+  } catch (error) {
+    console.error(error);
+  }
+};
diff --git a/src/lib/temple/back/vault/storage-keys.ts b/src/lib/temple/back/vault/storage-keys.ts
new file mode 100644
index 0000000000..999843c266
--- /dev/null
+++ b/src/lib/temple/back/vault/storage-keys.ts
@@ -0,0 +1,34 @@
+const STORAGE_KEY_PREFIX = 'vault';
+
+enum StorageEntity {
+  Check = 'check',
+  MigrationLevel = 'migration',
+  Mnemonic = 'mnemonic',
+  AccPrivKey = 'accprivkey',
+  AccPubKey = 'accpubkey',
+  Accounts = 'accounts',
+  Settings = 'settings',
+  LegacyMigrationLevel = 'mgrnlvl'
+}
+
+export const checkStrgKey = createStorageKey(StorageEntity.Check);
+export const migrationLevelStrgKey = createStorageKey(StorageEntity.MigrationLevel);
+export const mnemonicStrgKey = createStorageKey(StorageEntity.Mnemonic);
+export const accPrivKeyStrgKey = createDynamicStorageKey(StorageEntity.AccPrivKey);
+export const accPubKeyStrgKey = createDynamicStorageKey(StorageEntity.AccPubKey);
+export const accountsStrgKey = createStorageKey(StorageEntity.Accounts);
+export const settingsStrgKey = createStorageKey(StorageEntity.Settings);
+export const legacyMigrationLevelStrgKey = createStorageKey(StorageEntity.LegacyMigrationLevel);
+
+function createStorageKey(id: StorageEntity) {
+  return combineStorageKey(STORAGE_KEY_PREFIX, id);
+}
+
+function createDynamicStorageKey(id: StorageEntity) {
+  const keyBase = combineStorageKey(STORAGE_KEY_PREFIX, id);
+  return (...subKeys: (number | string)[]) => combineStorageKey(keyBase, ...subKeys);
+}
+
+function combineStorageKey(...parts: (string | number)[]) {
+  return parts.join('_');
+}
diff --git a/src/lib/temple/back/vault.test.ts b/src/lib/temple/back/vault/vault.test.ts
similarity index 99%
rename from src/lib/temple/back/vault.test.ts
rename to src/lib/temple/back/vault/vault.test.ts
index 98dced97cb..a3fcd6146f 100644
--- a/src/lib/temple/back/vault.test.ts
+++ b/src/lib/temple/back/vault/vault.test.ts
@@ -1,7 +1,7 @@
 import browser from 'webextension-polyfill';
 
-import { TempleAccountType, TempleSettings } from '../types';
-import { Vault } from './vault';
+import { TempleAccountType, TempleSettings } from '../../types';
+import { Vault } from './index';
 
 const password = 'Test123!';
 const mnemonic = 'street seminar popular skill actress route treat coral ready bar program affair';
diff --git a/src/lib/temple/beacon.ts b/src/lib/temple/beacon.ts
index 94126d51b2..8ba763a05f 100644
--- a/src/lib/temple/beacon.ts
+++ b/src/lib/temple/beacon.ts
@@ -1,3 +1,4 @@
+import bs58check from 'bs58check';
 import { Buffer } from 'buffer';
 import {
   crypto_generichash,
@@ -20,8 +21,6 @@ import {
 import memoize from 'p-memoize';
 import browser from 'webextension-polyfill';
 
-import * as bs58check from 'bs58check';
-
 interface AppMetadata {
   senderId: string;
   name: string;
diff --git a/src/lib/temple/front/assets.ts b/src/lib/temple/front/assets.ts
index f9bb3d1e28..661befc38e 100644
--- a/src/lib/temple/front/assets.ts
+++ b/src/lib/temple/front/assets.ts
@@ -327,11 +327,11 @@ function searchAssets(searchValue: string, assetSlugs: string[], allTokensBaseMe
     })),
     {
       keys: [
-        { name: 'metadata.name', weight: 0.9 },
-        { name: 'metadata.symbol', weight: 0.7 },
-        { name: 'slug', weight: 0.3 }
+        { name: 'metadata.symbol', weight: 1 },
+        { name: 'metadata.name', weight: 0.25 },
+        { name: 'slug', weight: 0.1 }
       ],
-      threshold: 1
+      threshold: 0.1
     }
   );
 
diff --git a/src/lib/temple/front/helpers.ts b/src/lib/temple/front/helpers.ts
index b199dbff11..26b957d277 100644
--- a/src/lib/temple/front/helpers.ts
+++ b/src/lib/temple/front/helpers.ts
@@ -1,5 +1,6 @@
 import { getMessage } from 'lib/i18n';
 import { isAddressValid, isKTAddress } from 'lib/temple/helpers';
+import { isTruthy } from 'lib/utils';
 
 export function validateDerivationPath(p: string) {
   if (p.length === 0) return true;
@@ -10,7 +11,7 @@ export function validateDerivationPath(p: string) {
     return getMessage('derivationSeparatorMustBeSlash');
   }
 
-  const parts = p.replace('m', '').split('/').filter(Boolean);
+  const parts = p.replace('m', '').split('/').filter(isTruthy);
   if (
     !parts.every(itemPart => {
       const pNum = +(itemPart.includes("'") ? itemPart.replace("'", '') : itemPart);
diff --git a/src/lib/temple/passworder.ts b/src/lib/temple/passworder.ts
index 3e83928705..b360441a63 100644
--- a/src/lib/temple/passworder.ts
+++ b/src/lib/temple/passworder.ts
@@ -53,8 +53,12 @@ export async function decrypt<T = any>(
   return JSON.parse(stuffStr);
 }
 
+export function generateHash(password: string) {
+  return crypto.subtle.digest('SHA-256', Buffer.from(password, 'utf-8'));
+}
+
 export async function generateKey(password: string) {
-  const hash = await crypto.subtle.digest('SHA-256', Buffer.from(password, 'utf-8'));
+  const hash = await generateHash(password);
   return importKey(hash);
 }
 
@@ -79,7 +83,7 @@ export function generateSalt(byteCount = 32) {
   return view;
 }
 
-function importKey(keyData: ArrayBuffer) {
+export function importKey(keyData: ArrayBuffer) {
   return crypto.subtle.importKey('raw', keyData, 'PBKDF2', false, ['deriveBits', 'deriveKey']);
 }
 
diff --git a/src/lib/temple/reset.ts b/src/lib/temple/reset.ts
index 2552106ac6..f966b0dc2f 100644
--- a/src/lib/temple/reset.ts
+++ b/src/lib/temple/reset.ts
@@ -1,5 +1,4 @@
-import browser from 'webextension-polyfill';
-
+import { browser } from 'lib/browser';
 import * as Repo from 'lib/temple/repo';
 
 export async function clearAllStorages() {
@@ -11,6 +10,7 @@ export async function clearAsyncStorages() {
   await Repo.db.delete();
   await Repo.db.open();
   await browser.storage.local.clear();
+  await browser.storage.session?.clear();
 }
 
 export function clearLocalStorage(exceptionsKeys?: string[]) {
diff --git a/src/lib/types.d.ts b/src/lib/types.d.ts
index 1b0a5f1954..f1bdf7e3f3 100644
--- a/src/lib/types.d.ts
+++ b/src/lib/types.d.ts
@@ -4,6 +4,8 @@ type JSONifiable = string | number | boolean | null | { [x: string]: JSONifiable
 
 type EmptyFn = () => void;
 
+type WithRequired<T, K extends keyof T> = T & { [P in K]-?: T[P] };
+
 interface PropsWithChildren {
   children: import('react').ReactNode;
 }
diff --git a/src/lib/ui/Image.tsx b/src/lib/ui/Image.tsx
index 773da67650..28171b408e 100644
--- a/src/lib/ui/Image.tsx
+++ b/src/lib/ui/Image.tsx
@@ -1,13 +1,16 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import ReactImageFallback from 'react-image-fallback';
 
 interface Props {
-  src: string;
+  src?: string | (string | undefined)[];
   alt?: string;
   className?: string;
   loader?: React.ReactElement;
   fallback?: React.ReactElement;
+  width?: string | number;
+  height?: string | number;
+  style?: React.CSSProperties;
 }
 
 /*
@@ -18,12 +21,32 @@ interface Props {
 ReactImageFallback.prototype.componentDidUpdate = ReactImageFallback.prototype.componentWillReceiveProps;
 delete ReactImageFallback.prototype.componentWillReceiveProps;
 
-export const Image: React.FC<Props> = ({ src, alt, className, loader, fallback }) => (
-  <ReactImageFallback
-    src={src}
-    className={className}
-    alt={alt}
-    initialImage={loader}
-    fallbackImage={fallback || <img src={src} alt={alt} className={className} />}
-  />
-);
+export const Image: React.FC<Props> = ({ src: sources, alt, loader, fallback, ...rest }) => {
+  const localFallback = useMemo(() => fallback || <img alt={alt} {...rest} />, [alt, rest]);
+
+  const { src, fallbackImage } = useMemo(() => {
+    let src: string | undefined;
+    let fallbackImage: React.ReactElement | (undefined | string | React.ReactElement)[];
+    if (Array.isArray(sources)) {
+      sources = sources.filter(Boolean);
+      src = sources[0];
+      fallbackImage = [...sources.slice(1), localFallback];
+    } else {
+      src = sources;
+      fallbackImage = localFallback;
+    }
+
+    return { src, fallbackImage };
+  }, [sources, localFallback]);
+
+  return (
+    <ReactImageFallback
+      key={src} // We force component recreation on src change
+      src={src}
+      alt={alt}
+      initialImage={loader}
+      fallbackImage={fallbackImage as any}
+      {...rest}
+    />
+  );
+};
diff --git a/src/lib/utils/buffers.ts b/src/lib/utils/buffers.ts
new file mode 100644
index 0000000000..c4ebcfbdff
--- /dev/null
+++ b/src/lib/utils/buffers.ts
@@ -0,0 +1,26 @@
+/**
+ * (!) Apply this method in conjunction with `stringToArrayBuffer`
+ */
+export const arrayBufferToString = (buf: ArrayBuffer) =>
+  String.fromCharCode.apply(
+    null,
+    // @ts-ignore
+    new Uint16Array(buf)
+  );
+
+/**
+ * See: https://developer.chrome.com/blog/how-to-convert-arraybuffer-to-and-from-string
+ *
+ * @param str // String with 'utf-16' encoded characters
+ */
+export const stringToArrayBuffer = (str: string) => {
+  const buf = new ArrayBuffer(str.length * 2); // 2 bytes for each char
+  const bufView = new Uint16Array(buf);
+  const strLength = str.length;
+  for (let i = 0; i < strLength; i++) bufView[i] = str.charCodeAt(i);
+  return buf;
+};
+
+export const uInt8ArrayToString = (ui8a: Uint8Array) => new TextDecoder('utf-8').decode(ui8a);
+
+export const stringToUInt8Array = (str: string) => new TextEncoder().encode(str);
diff --git a/src/lib/utils.ts b/src/lib/utils/index.ts
similarity index 91%
rename from src/lib/utils.ts
rename to src/lib/utils/index.ts
index 4225ce1563..30b5949ef8 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils/index.ts
@@ -1,3 +1,5 @@
+export { arrayBufferToString, stringToArrayBuffer, uInt8ArrayToString, stringToUInt8Array } from './buffers';
+
 /** From lodash */
 type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
 
diff --git a/src/lib/utils.test.ts b/src/lib/utils/utils.test.ts
similarity index 94%
rename from src/lib/utils.test.ts
rename to src/lib/utils/utils.test.ts
index 045561544f..0addec1d56 100644
--- a/src/lib/utils.test.ts
+++ b/src/lib/utils/utils.test.ts
@@ -1,4 +1,4 @@
-import { createQueue } from './utils';
+import { createQueue } from './index';
 
 describe('Queue', () => {
   it('queue', async () => {
diff --git a/src/lib/woozie/Link.tsx b/src/lib/woozie/Link.tsx
index ca9d9b229b..1e09714b6c 100644
--- a/src/lib/woozie/Link.tsx
+++ b/src/lib/woozie/Link.tsx
@@ -1,6 +1,6 @@
 import React, { AnchorHTMLAttributes, FC, MouseEventHandler, useCallback, useMemo } from 'react';
 
-import { TestIDProps, useAnalytics, AnalyticsEventCategory } from 'lib/analytics';
+import { TestIDProps, useAnalytics, AnalyticsEventCategory, setTestID } from 'lib/analytics';
 
 import { USE_LOCATION_HASH_AS_URL } from './config';
 import { HistoryAction, createUrl, changeState } from './history';
@@ -11,9 +11,8 @@ interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement>, TestIDProps
   replace?: boolean;
 }
 
-export const Link: FC<LinkProps> = ({ to, replace, testID, testIDProperties, ...rest }) => {
+export const Link: FC<LinkProps> = ({ to, replace, ...rest }) => {
   const lctn = useLocation();
-  const { trackEvent } = useAnalytics();
 
   const { pathname, search, hash, state } = useMemo(() => createLocationUpdates(to, lctn), [to, lctn]);
 
@@ -22,11 +21,10 @@ export const Link: FC<LinkProps> = ({ to, replace, testID, testIDProperties, ...
   const href = useMemo(() => (USE_LOCATION_HASH_AS_URL ? `${window.location.pathname}#${url}` : url), [url]);
 
   const handleNavigate = useCallback(() => {
-    testID !== undefined && trackEvent(testID, AnalyticsEventCategory.ButtonPress, testIDProperties);
     const action =
       replace || url === createUrl(lctn.pathname, lctn.search, lctn.hash) ? HistoryAction.Replace : HistoryAction.Push;
     changeState(action, state, url);
-  }, [replace, state, url, lctn, testID, testIDProperties, trackEvent]);
+  }, [replace, state, url, lctn]);
 
   return <LinkAnchor {...rest} href={href} onNavigate={handleNavigate} />;
 };
@@ -75,7 +73,7 @@ const LinkAnchor: FC<LinkAnchorProps> = ({
   );
 
   return (
-    <a onClick={handleClick} target={target} {...rest}>
+    <a onClick={handleClick} target={target} {...rest} {...setTestID(testID)}>
       {children}
     </a>
   );
diff --git a/src/popup.tsx b/src/popup.tsx
index b7dc2dcf08..f9df74a1e9 100644
--- a/src/popup.tsx
+++ b/src/popup.tsx
@@ -4,9 +4,6 @@ import React from 'react';
 
 import { createRoot } from 'react-dom/client';
 
-import 'lib/lock-up/run-checks';
-import 'lib/ledger/proxy/foreground';
-
 import { App } from 'app/App';
 import { WindowType, isPopupWindow, openInFullPage } from 'app/env';
 import { isPopupModeEnabled } from 'lib/popup-mode';
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index a001d834f3..0000000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,612 +0,0 @@
-/*
-  Reference for this config:
-  https://github.com/facebook/create-react-app/blob/main/packages/react-scripts/config/webpack.config.js
-*/
-
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const fs = require('fs');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
-const path = require('path');
-const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
-const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
-const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
-const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
-const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
-const resolve = require('resolve');
-const TerserPlugin = require('terser-webpack-plugin');
-const webpack = require('webpack');
-const ESLintPlugin = require('eslint-webpack-plugin');
-const ExtensionReloader = require('webpack-ext-reloader');
-const WebpackBar = require('webpackbar');
-const ZipPlugin = require('zip-webpack-plugin');
-
-const pkg = require('./package.json');
-const tsConfig = require('./tsconfig.json');
-
-const { NODE_ENV = 'development' } = process.env;
-const dotenvPath = path.resolve(__dirname, '.env');
-
-// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
-const dotenvFiles = [
-  `${dotenvPath}.${NODE_ENV}.local`,
-  // Don't include `.env.local` for `test` environment
-  // since normally you expect tests to produce the same
-  // results for everyone
-  NODE_ENV !== 'test' && `${dotenvPath}.local`,
-  `${dotenvPath}.${NODE_ENV}`,
-  dotenvPath
-].filter(Boolean);
-
-// Load environment variables from .env* files. Suppress warnings using silent
-// if this file is missing. dotenv will never modify any environment variables
-// that have already been set.  Variable expansion is supported in .env files.
-// https://github.com/motdotla/dotenv
-// https://github.com/motdotla/dotenv-expand
-dotenvFiles.forEach(dotenvFile => {
-  if (fs.existsSync(dotenvFile)) {
-    require('dotenv-expand')(
-      require('dotenv').config({
-        path: dotenvFile
-      })
-    );
-  }
-});
-
-// Grab NODE_ENV and TEMPLE_WALLET_* environment variables and prepare them to be
-// injected into the application via DefinePlugin in Webpack configuration.
-const TEMPLE_WALLET = /^TEMPLE_WALLET_/i;
-const {
-  TARGET_BROWSER = 'chrome',
-  SOURCE_MAP: SOURCE_MAP_ENV,
-  IMAGE_INLINE_SIZE_LIMIT: IMAGE_INLINE_SIZE_LIMIT_ENV = '10000'
-} = process.env;
-const VERSION = pkg.version;
-const SOURCE_MAP = NODE_ENV !== 'production' && SOURCE_MAP_ENV !== 'false';
-const IMAGE_INLINE_SIZE_LIMIT = parseInt(IMAGE_INLINE_SIZE_LIMIT_ENV);
-const CWD_PATH = fs.realpathSync(process.cwd());
-const NODE_MODULES_PATH = path.join(CWD_PATH, 'node_modules');
-const SOURCE_PATH = path.join(CWD_PATH, 'src');
-const PUBLIC_PATH = path.join(CWD_PATH, 'public');
-const DEST_PATH = path.join(CWD_PATH, 'dist');
-const WASM_PATH = path.join(NODE_MODULES_PATH, 'wasm-themis/src/libthemis.wasm');
-const OUTPUT_PATH = path.join(DEST_PATH, `${TARGET_BROWSER}_unpacked`);
-const SCRIPTS_PATH = path.join(OUTPUT_PATH, 'scripts/');
-const PACKED_EXTENSION = (() => {
-  switch (TARGET_BROWSER) {
-    case 'opera':
-      return 'crx';
-
-    case 'firefox':
-      return 'xpi';
-
-    default:
-      return 'zip';
-  }
-})();
-const OUTPUT_PACKED_PATH = path.join(OUTPUT_PATH, `${TARGET_BROWSER}.${PACKED_EXTENSION}`);
-const HTML_TEMPLATES = [
-  {
-    name: 'popup',
-    path: path.join(PUBLIC_PATH, 'popup.html')
-  },
-  {
-    name: 'fullpage',
-    path: path.join(PUBLIC_PATH, 'fullpage.html')
-  },
-  {
-    name: 'confirm',
-    path: path.join(PUBLIC_PATH, 'confirm.html')
-  },
-  {
-    name: 'options',
-    path: path.join(PUBLIC_PATH, 'options.html')
-  }
-];
-const ENTRIES = {
-  popup: path.join(SOURCE_PATH, 'popup.tsx'),
-  fullpage: path.join(SOURCE_PATH, 'fullpage.tsx'),
-  confirm: path.join(SOURCE_PATH, 'confirm.tsx'),
-  options: path.join(SOURCE_PATH, 'options.tsx'),
-  background: path.join(SOURCE_PATH, 'background.ts'),
-  contentScript: path.join(SOURCE_PATH, 'contentScript.ts')
-};
-
-const RELOADER_ENTRIES = {
-  contentScript: 'contentScript',
-  background: 'background',
-  extensionPage: ['popup', 'fullpage', 'confirm', 'options', 'commons.chunk']
-};
-const SEPARATED_CHUNKS = new Set(['background', 'contentScript']);
-const MANIFEST_PATH = path.join(PUBLIC_PATH, 'manifest.json');
-const MODULE_FILE_EXTENSIONS = ['.js', '.mjs', '.jsx', '.ts', '.tsx', '.json'];
-const ADDITIONAL_MODULE_PATHS = [
-  tsConfig.compilerOptions.baseUrl && path.join(CWD_PATH, tsConfig.compilerOptions.baseUrl)
-].filter(Boolean);
-const CSS_REGEX = /\.css$/;
-const CSS_MODULE_REGEX = /\.module\.css$/;
-
-/** @type {webpack.Configuration} */
-module.exports = {
-  mode: NODE_ENV,
-  bail: NODE_ENV === 'production',
-  devtool: SOURCE_MAP && 'eval',
-
-  entry: ENTRIES,
-
-  output: {
-    path: OUTPUT_PATH,
-    pathinfo: NODE_ENV === 'development' ? 'verbose' : false,
-    filename: 'scripts/[name].js',
-    chunkFilename: 'scripts/[name].chunk.js',
-    /* For `rule.type = 'asset' | 'asset/resource'` */
-    assetModuleFilename: 'media/[hash:8][ext]'
-  },
-
-  resolve: {
-    modules: [NODE_MODULES_PATH, ...ADDITIONAL_MODULE_PATHS],
-    extensions: MODULE_FILE_EXTENSIONS,
-
-    /*
-      Some libraries import Node modules but don't use them in the browser.
-      Tell Webpack to provide mocks for them so importing them works.
-    */
-    fallback: {
-      fs: false,
-      path: require.resolve('path-browserify'),
-      buffer: require.resolve('buffer'),
-      stream: require.resolve('stream-browserify'),
-      crypto: require.resolve('crypto-browserify'),
-      util: require.resolve('util/'),
-      assert: require.resolve('assert/'),
-      /* Current package version has a bug with false import path */
-      '@ledgerhq/devices/hid-framing': require.resolve('@ledgerhq/devices/lib-es/hid-framing'),
-    },
-
-    alias: {
-      /*
-        Exports of `punycode@2.1.1/punycode.js` & `punycode@2.1.1/punycode.es6.js` are different.
-        We need the former ones (e.g. `idna-uts46-hx` relies on it).
-      */
-      punycode$: require.resolve('punycode/punycode.js'),
-    },
-
-    alias: {
-      /*
-        Exports of `punycode@2.1.1/punycode.js` & `punycode@2.1.1/punycode.es6.js` are different.
-        We need the former ones (e.g. `idna-uts46-hx` relies on it).
-      */
-      punycode$: require.resolve('punycode/punycode.js'),
-    },
-
-    plugins: [
-      {
-        apply(resolver) {
-          const target = resolver.ensureHook('resolve');
-
-          resolver.getHook('resolve').tapAsync('TaquitoSignerResolverPlugin', (request, resolveContext, callback) => {
-            if (/@taquito\/signer$/.test(request.request) && /@taquito\/taquito/.test(request.context.issuer)) {
-              return resolver.doResolve(
-                target,
-                {
-                  ...request,
-                  request: 'lib/taquito-signer-stub'
-                },
-                null,
-                resolveContext,
-                callback
-              );
-            }
-
-            callback();
-          });
-        }
-      }
-    ]
-  },
-
-  module: {
-    strictExportPresence: true,
-
-    rules: [
-      {
-        // "oneOf" will traverse all following loaders until one will
-        // match the requirements. When no loader matches it will fall
-        // back to the "file" loader at the end of the loader list.
-        oneOf: [
-          // "url" loader works like "file" loader except that it embeds assets
-          // smaller than specified limit in bytes as data URLs to avoid requests.
-          // A missing `test` is equivalent to a match.
-          {
-            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-            type: 'asset',
-            parser: {
-              dataUrlCondition: {
-                maxSize: IMAGE_INLINE_SIZE_LIMIT
-              }
-            }
-          },
-          {
-            test: /\.svg$/,
-            issuer: {
-              and: [/\.(ts|tsx|js|jsx|md|mdx)$/]
-            },
-            use: [
-              {
-                loader: require.resolve('@svgr/webpack'),
-                options: {
-                  prettier: false,
-                  svgo: false,
-                  svgoConfig: {
-                    plugins: [{ removeViewBox: false }]
-                  },
-                  titleProp: true,
-                  ref: true
-                }
-              },
-              {
-                /* `type: 'asset/resource'` is not applicable here - WebPack bug. Had to go with `file-loader` */
-                loader: require.resolve('file-loader'),
-                options: {
-                  name: 'media/[hash:8].[ext]'
-                }
-              }
-            ]
-          },
-          // Process application JS with Babel.
-          // The preset includes JSX, Flow, TypeScript, and some ESnext features.
-          {
-            test: /\.(js|mjs|jsx|ts|tsx)$/,
-            include: SOURCE_PATH,
-            loader: require.resolve('babel-loader'),
-            options: {
-              customize: require.resolve('babel-preset-react-app/webpack-overrides'),
-              // This is a feature of `babel-loader` for webpack (not Babel itself).
-              // It enables caching results in ./node_modules/.cache/babel-loader/
-              // directory for faster rebuilds.
-              cacheDirectory: true,
-              // See #6846 for context on why cacheCompression is disabled
-              cacheCompression: false,
-              compact: NODE_ENV === 'production'
-            }
-          },
-          // Process any JS outside of the app with Babel.
-          // Unlike the application JS, we only compile the standard ES features.
-          {
-            test: /\.(js|mjs)$/,
-            exclude: /@babel(?:\/|\\{1,2})runtime/,
-            loader: require.resolve('babel-loader'),
-            options: {
-              babelrc: false,
-              configFile: false,
-              compact: false,
-              presets: [[require.resolve('babel-preset-react-app/dependencies'), { helpers: true }]],
-              cacheDirectory: true,
-              // See #6846 for context on why cacheCompression is disabled
-              cacheCompression: false,
-              // Babel sourcemaps are needed for debugging into node_modules
-              // code.  Without the options below, debuggers like VSCode
-              // show incorrect code and set breakpoints on the wrong lines.
-              sourceMaps: SOURCE_MAP,
-              inputSourceMap: SOURCE_MAP
-            }
-          },
-          // "postcss" loader applies autoprefixer to our CSS.
-          // "css" loader resolves paths in CSS and adds assets as dependencies.
-          // "style" loader turns CSS into JS modules that inject <style> tags.
-          // In production, we use MiniCSSExtractPlugin to extract that CSS
-          // to a file, but in development "style" loader enables hot editing
-          // of CSS.
-          // By default we support CSS Modules with the extension .module.css
-          {
-            test: CSS_REGEX,
-            exclude: CSS_MODULE_REGEX,
-            use: getStyleLoaders({
-              importLoaders: 1,
-              sourceMap: SOURCE_MAP
-            }),
-            // Don't consider CSS imports dead code even if the
-            // containing package claims to have no side effects.
-            // Remove this when webpack adds a warning or an error for this.
-            // See https://github.com/webpack/webpack/issues/6571
-            sideEffects: true
-          },
-          // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
-          // using the extension .module.css
-          {
-            test: CSS_MODULE_REGEX,
-            use: getStyleLoaders({
-              importLoaders: 1,
-              sourceMap: SOURCE_MAP,
-              modules: {
-                getLocalIdent: getCSSModuleLocalIdent
-              }
-            })
-          },
-          // "file" loader makes sure those assets get served by WebpackDevServer.
-          // When you `import` an asset, you get its (virtual) filename.
-          // In production, they would get copied to the `build` folder.
-          // This loader doesn't use a "test" so it will catch all modules
-          // that fall through the other loaders.
-          {
-            type: 'asset/resource',
-            // Exclude `js` files to keep "css" loader working as it injects
-            // its runtime that would otherwise be processed through "file" loader.
-            // Also exclude `html` and `json` extensions so they get processed
-            // by webpacks internal loaders.
-            exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/]
-          }
-          // ** STOP ** Are you adding a new loader?
-          // Make sure to add the new loader(s) before the "file" loader.
-        ]
-      }
-    ]
-  },
-
-  plugins: [
-    /*
-      Some dependencies do not perform checks on `typeof nodeSpecificAsset !== undefined`.
-      WebPack v4 injected `nodeSpecificAsset` automatically.
-    */
-    new webpack.ProvidePlugin({
-      process: 'process/browser.js',
-      Buffer: ['buffer', 'Buffer'],
-      // Seen 'setImmediate' in: 'scryptsy'
-      setImmediate: ['timers-browserify', 'setImmediate'],
-    }),
-
-    new webpack.IgnorePlugin({ resourceRegExp: /^\.\/wordlists\/(?!english)/, contextRegExp: /bip39\/src$/ }),
-
-    new CleanWebpackPlugin({
-      cleanOnceBeforeBuildPatterns: [OUTPUT_PATH, OUTPUT_PACKED_PATH],
-      cleanStaleWebpackAssets: false,
-      verbose: false
-    }),
-
-    new ModuleNotFoundPlugin(SOURCE_PATH),
-
-    new webpack.DefinePlugin({
-      SharedArrayBuffer: '_SharedArrayBuffer',
-      'process.env.NODE_ENV': JSON.stringify(NODE_ENV),
-      'process.env.VERSION': JSON.stringify(VERSION),
-      'process.env.TARGET_BROWSER': JSON.stringify(TARGET_BROWSER),
-      ...(() => {
-        const appEnvs = {};
-        for (const k of Object.keys(process.env)) {
-          if (TEMPLE_WALLET.test(k)) {
-            appEnvs[`process.env.${k}`] = JSON.stringify(process.env[k]);
-          }
-        }
-        return appEnvs;
-      })()
-    }),
-
-    new WatchMissingNodeModulesPlugin(NODE_MODULES_PATH),
-
-    new MiniCssExtractPlugin({
-      filename: 'styles/[name].css',
-      chunkFilename: 'styles/[name].chunk.css'
-    }),
-
-    ...HTML_TEMPLATES.map(
-      htmlTemplate =>
-        new HtmlWebpackPlugin({
-          template: htmlTemplate.path,
-          filename: path.basename(htmlTemplate.path),
-          chunks: [htmlTemplate.name],
-          inject: 'body',
-          ...(NODE_ENV === 'production'
-            ? {
-                minify: {
-                  removeComments: true,
-                  collapseWhitespace: true,
-                  removeRedundantAttributes: true,
-                  useShortDoctype: true,
-                  removeEmptyAttributes: true,
-                  removeStyleLinkTypeAttributes: true,
-                  keepClosingSlash: true,
-                  minifyJS: true,
-                  minifyCSS: true,
-                  minifyURLs: true
-                }
-              }
-            : {})
-        })
-    ),
-
-    new ForkTsCheckerWebpackPlugin({
-      typescript: resolve.sync('typescript', {
-        basedir: NODE_MODULES_PATH
-      }),
-      async: false,
-      silent: true,
-      useTypescriptIncrementalApi: true,
-      checkSyntacticErrors: true,
-      tsconfig: path.join(CWD_PATH, 'tsconfig.json'),
-      reportFiles: ['**', '!**/__tests__/**', '!**/?(*.)(spec|test).*', '!**/src/setupProxy.*', '!**/src/setupTests.*'],
-      formatter: typescriptFormatter
-    }),
-
-    new CopyWebpackPlugin({
-      patterns: [
-        {
-          from: PUBLIC_PATH,
-          to: OUTPUT_PATH,
-          globOptions: {
-            /*
-              - HTML files are taken care of by the `html-webpack-plugin`. Copying them here leads to:
-                `ERROR in Conflict: Multiple assets emit different content to the same filename [name].html`
-              - Manifest file is copied next with transformation of it.
-            */
-            ignore: ['**/*.html', '**/manifest.json']
-          }
-        },
-        {
-          from: MANIFEST_PATH,
-          to: path.join(OUTPUT_PATH, 'manifest.json'),
-          toType: 'file',
-          transform: content => {
-            const manifest = transformManifestKeys(JSON.parse(content), TARGET_BROWSER);
-            return JSON.stringify(manifest, null, 2);
-          }
-        },
-        {
-          from: WASM_PATH,
-          to: SCRIPTS_PATH
-        }
-      ]
-    }),
-
-    new WebpackBar({
-      name: 'Temple Wallet',
-      color: '#ed8936'
-    }),
-
-    // plugin to enable browser reloading in development mode
-
-    NODE_ENV === 'development' &&
-      new ExtensionReloader({
-        port: 9090,
-        reloadPage: true,
-        // manifest: path.join(OUTPUT_PATH, "manifest.json"),
-        entries: RELOADER_ENTRIES
-      }),
-
-    new ESLintPlugin({
-      extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx'],
-      formatter: require.resolve('react-dev-utils/eslintFormatter'),
-      eslintPath: require.resolve('eslint'),
-      resolvePluginsRelativeTo: __dirname,
-      cache: true,
-      cacheLocation: path.resolve(
-        NODE_MODULES_PATH,
-        '.cache/.eslintcache'
-      ),
-      failOnError: true,
-    }),
-  ].filter(Boolean),
-
-  optimization: {
-    splitChunks: {
-      cacheGroups: {
-        commons: {
-          name: 'commons.chunk',
-          minChunks: 2,
-          /* Firefox limitation of 4MB per chunk */
-          maxSize: 4_000_000,
-          chunks: chunk => !SEPARATED_CHUNKS.has(chunk.name)
-        }
-      }
-    },
-
-    minimizer: [
-      new TerserPlugin({
-        terserOptions: {
-          sourceMap: SOURCE_MAP,
-          parse: {
-            ecma: 8
-          },
-          compress: {
-            ecma: 5,
-            warnings: false,
-            comparisons: false,
-            inline: 2,
-            drop_console: NODE_ENV === 'production'
-          },
-          mangle: {
-            safari10: true
-          },
-          output: {
-            ecma: 5,
-            comments: false,
-            ascii_only: true
-          }
-        }
-      }),
-
-      // This is only used in production mode
-      new CssMinimizerPlugin(),
-
-      new ZipPlugin({
-        path: DEST_PATH,
-        extension: PACKED_EXTENSION,
-        filename: TARGET_BROWSER
-      })
-    ]
-  },
-
-  // Turn off performance processing because we utilize
-  // our own hints via the FileSizeReporter
-  performance: false
-};
-
-function getStyleLoaders(cssOptions = {}) {
-  return [
-    {
-      loader: MiniCssExtractPlugin.loader,
-      options: {
-        publicPath: '../'
-      }
-    },
-    {
-      loader: require.resolve('css-loader'),
-      options: cssOptions
-    },
-    {
-      loader: require.resolve('postcss-loader'),
-      options: {
-        postcssOptions: {
-          ident: 'postcss',
-          plugins: [
-            require('postcss-flexbugs-fixes'),
-            require('postcss-preset-env')({
-              autoprefixer: {
-                flexbox: 'no-2009'
-              },
-              stage: 3
-            }),
-            require('tailwindcss'),
-            require('autoprefixer')
-          ]
-        }
-      }
-    }
-  ].filter(Boolean);
-}
-
-/**
- *  Fork of `wext-manifest`
- */
-const browserVendors = ['chrome', 'firefox', 'opera', 'edge', 'safari'];
-const vendorRegExp = new RegExp(`^__((?:(?:${browserVendors.join('|')})\\|?)+)__(.*)`);
-
-const transformManifestKeys = (manifest, vendor) => {
-  if (Array.isArray(manifest)) {
-    return manifest.map(newManifest => {
-      return transformManifestKeys(newManifest, vendor);
-    });
-  }
-
-  if (typeof manifest === 'object') {
-    return Object.entries(manifest).reduce((newManifest, [key, value]) => {
-      const match = key.match(vendorRegExp);
-
-      if (match) {
-        const vendors = match[1].split('|');
-
-        // Swap key with non prefixed name
-        if (vendors.indexOf(vendor) > -1) {
-          newManifest[match[2]] = value;
-        }
-      } else {
-        newManifest[key] = transformManifestKeys(value, vendor);
-      }
-
-      return newManifest;
-    }, {});
-  }
-
-  return manifest;
-};
diff --git a/webpack.config.ts b/webpack.config.ts
new file mode 100644
index 0000000000..b3362888d8
--- /dev/null
+++ b/webpack.config.ts
@@ -0,0 +1,260 @@
+/*
+  Reference for this config:
+  https://github.com/facebook/create-react-app/blob/main/packages/react-scripts/config/webpack.config.js
+*/
+
+import { CleanWebpackPlugin } from 'clean-webpack-plugin';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import CreateFileWebpack from 'create-file-webpack';
+import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import * as Path from 'path';
+import ExtensionReloaderBadlyTyped, { ExtensionReloader as ExtensionReloaderType } from 'webpack-ext-reloader';
+import ExtensionReloaderMV3BadlyTyped, {
+  ExtensionReloader as ExtensionReloaderMV3Type
+} from 'webpack-ext-reloader-mv3';
+import WebExtensionTargetPlugin from 'webpack-target-webextension';
+import WebpackBar from 'webpackbar';
+
+import { buildBaseConfig } from './webpack/base.config';
+import {
+  DEVELOPMENT_ENV,
+  PRODUCTION_ENV,
+  TARGET_BROWSER,
+  MANIFEST_VERSION,
+  BACKGROUND_IS_WORKER,
+  RELOADER_PORTS
+} from './webpack/env';
+import usePagesLiveReload from './webpack/live-reload';
+import { buildManifest } from './webpack/manifest';
+import { PATHS } from './webpack/paths';
+import { isTruthy } from './webpack/utils';
+
+const ExtensionReloader = ExtensionReloaderBadlyTyped as ExtensionReloaderType;
+const ExtensionReloaderMV3 = ExtensionReloaderMV3BadlyTyped as ExtensionReloaderMV3Type;
+
+const PAGES_NAMES = ['popup', 'fullpage', 'confirm', 'options'];
+const HTML_TEMPLATES = PAGES_NAMES.map(name => {
+  const filename = `${name}.html`;
+  const path = Path.join(PATHS.PUBLIC, filename);
+  return { name, filename, path };
+});
+
+const CONTENT_SCRIPTS = ['contentScript'];
+const SEPARATED_CHUNKS = new Set(CONTENT_SCRIPTS);
+
+const mainConfig = (() => {
+  const config = buildBaseConfig();
+
+  /* Page reloading in development mode */
+  const liveReload = DEVELOPMENT_ENV && usePagesLiveReload(RELOADER_PORTS.PAGES);
+
+  config.entry = Object.fromEntries(PAGES_NAMES.map(name => [name, Path.join(PATHS.SOURCE, `${name}.tsx`)]));
+
+  if (liveReload) config.entry.live_reload = liveReload.client_entry;
+
+  config.output = {
+    ...config.output,
+    filename: 'pages/[name].js',
+    chunkFilename: 'pages/[name].chunk.js'
+  };
+
+  config.plugins!.push(
+    ...[
+      new WebpackBar({
+        name: 'Temple Wallet | Main',
+        color: '#ed8936'
+      }),
+
+      new CleanWebpackPlugin({
+        cleanOnceBeforeBuildPatterns: [`**/*`, `!scripts/**`, `!background/**`, PATHS.OUTPUT_PACKED],
+        cleanStaleWebpackAssets: false,
+        verbose: false
+      }),
+
+      new MiniCssExtractPlugin({
+        filename: 'styles/[name].css',
+        chunkFilename: 'styles/[name].chunk.css'
+      }),
+
+      ...HTML_TEMPLATES.map(
+        ({ name, filename, path }) =>
+          new HtmlWebpackPlugin({
+            template: path,
+            filename,
+            chunks: liveReload ? [name, 'live_reload'] : [name],
+            inject: 'body',
+            ...(PRODUCTION_ENV
+              ? {
+                  minify: {
+                    removeComments: true,
+                    collapseWhitespace: true,
+                    removeRedundantAttributes: true,
+                    useShortDoctype: true,
+                    removeEmptyAttributes: true,
+                    removeStyleLinkTypeAttributes: true,
+                    keepClosingSlash: true,
+                    minifyJS: true,
+                    minifyCSS: true,
+                    minifyURLs: true
+                  }
+                }
+              : {})
+          })
+      ),
+
+      new CopyWebpackPlugin({
+        patterns: [
+          {
+            from: PATHS.PUBLIC,
+            to: PATHS.OUTPUT,
+            globOptions: {
+              /*
+                - HTML files are taken care of by the `html-webpack-plugin`. Copying them here leads to:
+                  `ERROR in Conflict: Multiple assets emit different content to the same filename [name].html`
+                - Manifest file is copied next, along with transformation of it.
+              */
+              ignore: ['**/*.html']
+            }
+          },
+          /*
+            Using `asset/resource` rule type with `webworker` target isn't working.
+            See: https://github.com/vercel/next.js/issues/22581
+          */
+          { from: PATHS.LIBTHEMIS_WASM_FILE, to: PATHS.OUTPUT_WASM }
+        ]
+      }),
+
+      new CreateFileWebpack({
+        path: PATHS.OUTPUT,
+        fileName: 'manifest.json',
+        content: (() => {
+          const manifest = buildManifest(TARGET_BROWSER);
+          return JSON.stringify(manifest, null, 2);
+        })()
+      }),
+
+      ...(liveReload ? liveReload.plugins : [])
+    ].filter(isTruthy)
+  );
+
+  config.optimization!.splitChunks = {
+    cacheGroups: {
+      commons: {
+        name: 'commons.chunk',
+        minChunks: 2,
+        /* Firefox limitation of 4MB per chunk */
+        maxSize: 4_000_000,
+        chunks: chunk => !SEPARATED_CHUNKS.has(chunk.name)
+      }
+    }
+  };
+
+  config.optimization!.minimizer!.push(
+    // This is only used in production mode
+    new CssMinimizerPlugin()
+  );
+
+  return config;
+})();
+
+const scriptsConfig = (() => {
+  const config = buildBaseConfig();
+
+  config.entry = {
+    contentScript: Path.join(PATHS.SOURCE, 'contentScript.ts')
+  };
+
+  config.output = {
+    ...config.output,
+    filename: 'scripts/[name].js',
+    chunkFilename: 'scripts/[name].chunk.js'
+  };
+
+  config.plugins!.push(
+    ...[
+      new WebpackBar({
+        name: 'Temple Wallet | Scripts',
+        color: '#ed8936'
+      }),
+
+      new CleanWebpackPlugin({
+        cleanOnceBeforeBuildPatterns: ['scripts/**'],
+        cleanStaleWebpackAssets: false,
+        verbose: false
+      }),
+
+      /* Page reloading in development mode */
+      DEVELOPMENT_ENV &&
+        new ExtensionReloader({
+          port: RELOADER_PORTS.SCRIPTS,
+          reloadPage: true,
+          entries: {
+            background: '',
+            contentScript: CONTENT_SCRIPTS
+          }
+        })
+    ].filter(isTruthy)
+  );
+
+  return config;
+})();
+
+const backgroundConfig = (() => {
+  const config = buildBaseConfig();
+
+  if (BACKGROUND_IS_WORKER) config.target = 'webworker';
+
+  config.entry = {
+    background: Path.join(PATHS.SOURCE, 'background.ts')
+  };
+
+  config.output = {
+    ...config.output,
+    filename: 'background/index.js',
+    chunkFilename: 'background/[name].chunk.js'
+  };
+
+  config.plugins!.push(
+    ...[
+      new WebpackBar({
+        name: 'Temple Wallet | Background',
+        color: '#ed8936'
+      }),
+
+      new CleanWebpackPlugin({
+        cleanOnceBeforeBuildPatterns: ['background/**'],
+        cleanStaleWebpackAssets: false,
+        verbose: false
+      }),
+
+      /*
+        Handling dynamic imports, converted to ServiceWorker's `importScripts`, and failing
+        over being called deferred, not at the root of the script.
+      */
+      BACKGROUND_IS_WORKER &&
+        new WebExtensionTargetPlugin({
+          background: {
+            entry: 'background',
+            manifest: MANIFEST_VERSION
+          }
+        }),
+
+      /* Page reloading in development mode */
+      DEVELOPMENT_ENV &&
+        new ExtensionReloaderMV3({
+          port: RELOADER_PORTS.BACKGROUND,
+          reloadPage: true,
+          entries: { background: 'background', contentScript: [] }
+        })
+    ].filter(isTruthy)
+  );
+
+  return config;
+})();
+
+const configurations = [mainConfig, scriptsConfig, backgroundConfig];
+
+export default configurations;
+export const parallelism = 3;
diff --git a/webpack/base.config.ts b/webpack/base.config.ts
new file mode 100644
index 0000000000..f781266073
--- /dev/null
+++ b/webpack/base.config.ts
@@ -0,0 +1,405 @@
+/*
+  Reference for this config:
+  https://github.com/facebook/create-react-app/blob/main/packages/react-scripts/config/webpack.config.js
+*/
+
+import ESLintPlugin from 'eslint-webpack-plugin';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import * as path from 'path';
+import ForkTsCheckerWebpackPlugin from 'react-dev-utils/ForkTsCheckerWebpackPlugin';
+import getCSSModuleLocalIdent from 'react-dev-utils/getCSSModuleLocalIdent';
+import ModuleNotFoundPlugin from 'react-dev-utils/ModuleNotFoundPlugin';
+import resolve from 'resolve';
+import TerserPlugin from 'terser-webpack-plugin';
+import WebPack from 'webpack';
+
+import packageJSON from '../package.json';
+import tsConfig from '../tsconfig.json';
+import {
+  NODE_ENV,
+  WEBPACK_MODE,
+  DEVELOPMENT_ENV,
+  PRODUCTION_ENV,
+  TARGET_BROWSER,
+  DROP_CONSOLE_IN_PROD,
+  SOURCE_MAP,
+  MANIFEST_VERSION,
+  BACKGROUND_IS_WORKER,
+  IMAGE_INLINE_SIZE_LIMIT_ENV
+} from './env';
+import { PATHS } from './paths';
+
+// Grab NODE_ENV and TEMPLE_WALLET_* environment variables and prepare them to be
+// injected into the application via DefinePlugin in Webpack configuration.
+const TEMPLE_WALLET = /^TEMPLE_WALLET_/i;
+
+const VERSION = packageJSON.version;
+const IMAGE_INLINE_SIZE_LIMIT = parseInt(IMAGE_INLINE_SIZE_LIMIT_ENV);
+
+const MODULE_FILE_EXTENSIONS = ['.js', '.mjs', '.jsx', '.ts', '.tsx', '.json'];
+const ADDITIONAL_MODULE_PATHS = [
+  tsConfig.compilerOptions.baseUrl && path.join(PATHS.CWD, tsConfig.compilerOptions.baseUrl)
+].filter(Boolean);
+const CSS_REGEX = /\.css$/;
+const CSS_MODULE_REGEX = /\.module\.css$/;
+
+export const buildBaseConfig = (): WebPack.Configuration & Pick<WebPack.WebpackOptionsNormalized, 'devServer'> => ({
+  mode: WEBPACK_MODE,
+  bail: PRODUCTION_ENV,
+  devtool: SOURCE_MAP && 'inline-cheap-module-source-map',
+
+  output: {
+    path: PATHS.OUTPUT,
+    pathinfo: DEVELOPMENT_ENV ? 'verbose' : false,
+    /* For `rule.type = 'asset' | 'asset/resource'` */
+    assetModuleFilename: 'media/[hash:8][ext]'
+  },
+
+  resolve: {
+    modules: [PATHS.NODE_MODULES, ...ADDITIONAL_MODULE_PATHS],
+    extensions: MODULE_FILE_EXTENSIONS,
+
+    /*
+      Some libraries import Node modules but don't use them in the browser.
+      Tell Webpack to provide mocks for them so importing them works.
+    */
+    fallback: {
+      fs: false,
+      path: require.resolve('path-browserify'),
+      buffer: require.resolve('buffer'),
+      stream: require.resolve('stream-browserify'),
+      crypto: require.resolve('crypto-browserify'),
+      util: require.resolve('util/'),
+      assert: require.resolve('assert/'),
+      /* Current package version has a bug with false import path */
+      '@ledgerhq/devices/hid-framing': require.resolve('@ledgerhq/devices/lib-es/hid-framing')
+    },
+
+    alias: {
+      /*
+        Exports of `punycode@2.1.1/punycode.js` & `punycode@2.1.1/punycode.es6.js` are different.
+        We need the former ones (e.g. `idna-uts46-hx` relies on it).
+      */
+      punycode$: require.resolve('punycode/punycode.js')
+    }
+  },
+
+  module: {
+    strictExportPresence: true,
+
+    rules: [
+      {
+        // "oneOf" will traverse all following loaders until one will
+        // match the requirements. When no loader matches it will fall
+        // back to the "file" loader at the end of the loader list.
+        oneOf: [
+          // "url" loader works like "file" loader except that it embeds assets
+          // smaller than specified limit in bytes as data URLs to avoid requests.
+          // A missing `test` is equivalent to a match.
+          {
+            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+            type: 'asset',
+            parser: {
+              dataUrlCondition: {
+                maxSize: IMAGE_INLINE_SIZE_LIMIT
+              }
+            }
+          },
+          {
+            test: /\.svg$/,
+            issuer: {
+              and: [/\.(ts|tsx|js|jsx|md|mdx)$/]
+            },
+            use: [
+              {
+                loader: require.resolve('@svgr/webpack'),
+                options: {
+                  prettier: false,
+                  svgo: false,
+                  svgoConfig: {
+                    plugins: [{ removeViewBox: false }]
+                  },
+                  titleProp: true,
+                  ref: true
+                }
+              },
+              {
+                /* `type: 'asset/resource'` is not applicable here - WebPack bug. Had to go with `file-loader` */
+                loader: require.resolve('file-loader'),
+                options: {
+                  name: 'media/[hash:8].[ext]'
+                }
+              }
+            ]
+          },
+          // Process application JS with Babel.
+          // The preset includes JSX, Flow, TypeScript, and some ESnext features.
+          {
+            test: /\.(js|mjs|jsx|ts|tsx)$/,
+            include: PATHS.SOURCE,
+            loader: require.resolve('babel-loader'),
+            options: {
+              customize: require.resolve('babel-preset-react-app/webpack-overrides'),
+              // This is a feature of `babel-loader` for webpack (not Babel itself).
+              // It enables caching results in ./node_modules/.cache/babel-loader/
+              // directory for faster rebuilds.
+              cacheDirectory: true,
+              // See #6846 for context on why cacheCompression is disabled
+              cacheCompression: false,
+              compact: PRODUCTION_ENV
+            }
+          },
+          // Process any JS outside of the app with Babel.
+          // Unlike the application JS, we only compile the standard ES features.
+          {
+            test: /\.(js|mjs)$/,
+            exclude: /@babel(?:\/|\\{1,2})runtime/,
+            loader: require.resolve('babel-loader'),
+            options: {
+              babelrc: false,
+              configFile: false,
+              compact: false,
+              presets: [[require.resolve('babel-preset-react-app/dependencies'), { helpers: true }]],
+              cacheDirectory: true,
+              // See #6846 for context on why cacheCompression is disabled
+              cacheCompression: false,
+              // Babel sourcemaps are needed for debugging into node_modules
+              // code.  Without the options below, debuggers like VSCode
+              // show incorrect code and set breakpoints on the wrong lines.
+              sourceMaps: SOURCE_MAP,
+              inputSourceMap: SOURCE_MAP
+            }
+          },
+          // "postcss" loader applies autoprefixer to our CSS.
+          // "css" loader resolves paths in CSS and adds assets as dependencies.
+          // "style" loader turns CSS into JS modules that inject <style> tags.
+          // In production, we use MiniCSSExtractPlugin to extract that CSS
+          // to a file, but in development "style" loader enables hot editing
+          // of CSS.
+          // By default we support CSS Modules with the extension .module.css
+          {
+            test: CSS_REGEX,
+            exclude: CSS_MODULE_REGEX,
+            use: getStyleLoaders({
+              importLoaders: 1,
+              sourceMap: SOURCE_MAP
+            }),
+            // Don't consider CSS imports dead code even if the
+            // containing package claims to have no side effects.
+            // Remove this when webpack adds a warning or an error for this.
+            // See https://github.com/webpack/webpack/issues/6571
+            sideEffects: true
+          },
+          // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
+          // using the extension .module.css
+          {
+            test: CSS_MODULE_REGEX,
+            use: getStyleLoaders({
+              importLoaders: 1,
+              sourceMap: SOURCE_MAP,
+              modules: {
+                getLocalIdent: getCSSModuleLocalIdent
+              }
+            })
+          },
+          // "file" loader makes sure those assets get served by WebpackDevServer.
+          // When you `import` an asset, you get its (virtual) filename.
+          // In production, they would get copied to the `build` folder.
+          // This loader doesn't use a "test" so it will catch all modules
+          // that fall through the other loaders.
+          {
+            type: 'asset/resource',
+            // Exclude `js` files to keep "css" loader working as it injects
+            // its runtime that would otherwise be processed through "file" loader.
+            // Also exclude `html` and `json` extensions so they get processed
+            // by webpacks internal loaders.
+            exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/]
+          }
+          // ** STOP ** Are you adding a new loader?
+          // Make sure to add the new loader(s) before the "file" loader.
+        ]
+      }
+    ]
+  },
+
+  plugins: [
+    /*
+      Some dependencies do not perform checks on `typeof nodeSpecificAsset !== undefined`.
+      WebPack v4 injected `nodeSpecificAsset` automatically.
+    */
+    new WebPack.ProvidePlugin({
+      process: 'process/browser.js',
+      Buffer: ['buffer', 'Buffer'],
+      // Seen 'setImmediate' in: 'scryptsy'
+      setImmediate: ['timers-browserify', 'setImmediate']
+    }),
+
+    new WebPack.IgnorePlugin({ resourceRegExp: /^\.\/wordlists\/(?!english)/, contextRegExp: /bip39\/src$/ }),
+
+    new ModuleNotFoundPlugin(PATHS.SOURCE),
+
+    new WebPack.DefinePlugin({
+      SharedArrayBuffer: '_SharedArrayBuffer',
+      'process.env.NODE_ENV': JSON.stringify(NODE_ENV),
+      'process.env.VERSION': JSON.stringify(VERSION),
+      'process.env.MANIFEST_VERSION': JSON.stringify(String(MANIFEST_VERSION)),
+      'process.env.BACKGROUND_IS_WORKER': JSON.stringify(String(BACKGROUND_IS_WORKER)),
+      'process.env.TARGET_BROWSER': JSON.stringify(TARGET_BROWSER),
+      ...(() => {
+        const appEnvs: Record<`process.env.${string}`, string> = {};
+        for (const k of Object.keys(process.env)) {
+          if (TEMPLE_WALLET.test(k)) {
+            appEnvs[`process.env.${k}`] = JSON.stringify(process.env[k]);
+          }
+        }
+        return appEnvs;
+      })()
+    }),
+
+    new ForkTsCheckerWebpackPlugin({
+      async: DEVELOPMENT_ENV,
+      typescript: {
+        typescriptPath: resolve.sync('typescript', {
+          basedir: PATHS.NODE_MODULES
+        }),
+        configOverwrite: {
+          compilerOptions: {
+            sourceMap: DEVELOPMENT_ENV,
+            skipLibCheck: true,
+            inlineSourceMap: false,
+            declarationMap: false,
+            noEmit: true,
+            incremental: true,
+            tsBuildInfoFile: false
+          }
+        },
+        // context: paths.appPath,
+        diagnosticOptions: {
+          syntactic: true
+        },
+        mode: 'write-references'
+        // profile: true
+      },
+      issue: {
+        // This one is specifically to match during CI tests,
+        // as micromatch doesn't match
+        // '../cra-template-typescript/template/src/App.tsx'
+        // otherwise.
+        include: [{ file: '../**/src/**/*.{ts,tsx}' }, { file: '**/src/**/*.{ts,tsx}' }],
+        exclude: [
+          { file: '**/src/**/__tests__/**' },
+          { file: '**/src/**/?(*.){spec|test}.*' },
+          { file: '**/src/setupProxy.*' },
+          { file: '**/src/setupTests.*' }
+        ]
+      },
+      logger: {
+        infrastructure: 'silent'
+      }
+    }),
+
+    new ESLintPlugin({
+      extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx'],
+      formatter: require.resolve('react-dev-utils/eslintFormatter'),
+      eslintPath: require.resolve('eslint'),
+      resolvePluginsRelativeTo: PATHS.CWD,
+      cache: true,
+      cacheLocation: path.resolve(PATHS.NODE_MODULES, '.cache/.eslintcache'),
+      failOnError: true
+    })
+  ].filter(Boolean),
+
+  optimization: {
+    minimize: PRODUCTION_ENV,
+
+    minimizer: [
+      // This is only used in production mode
+      new TerserPlugin({
+        terserOptions: {
+          sourceMap: SOURCE_MAP,
+          parse: {
+            /*
+              We want terser to parse ecma 8 code. However, we don't want it
+              to apply any minification steps that turns valid ecma 5 code
+              into invalid ecma 5 code. This is why the 'compress' and 'output'
+              sections only apply transformations that are ecma 5 safe
+              https://github.com/facebook/create-react-app/pull/4234
+            */
+            ecma: 2017 // ES8
+          },
+          compress: {
+            ecma: 5,
+            warnings: false,
+            /*
+              Disabled because of an issue with Uglify breaking seemingly valid code:
+              https://github.com/facebook/create-react-app/issues/2376
+              Pending further investigation:
+              https://github.com/mishoo/UglifyJS2/issues/2011
+            */
+            comparisons: false,
+            /*
+              Disabled because of an issue with Terser breaking valid code:
+              https://github.com/facebook/create-react-app/issues/5250
+              Pending further investigation:
+              https://github.com/terser-js/terser/issues/120
+            */
+            inline: 2,
+            drop_console: DROP_CONSOLE_IN_PROD && PRODUCTION_ENV
+          },
+          mangle: {
+            safari10: true
+          },
+          keep_classnames: false,
+          keep_fnames: false,
+          output: {
+            ecma: 5,
+            comments: false,
+            /*
+              Turned on because emoji and regex is not minified properly using default
+              https://github.com/facebook/create-react-app/issues/2488
+            */
+            ascii_only: true
+          }
+        }
+      })
+    ]
+  },
+
+  // Turn off performance processing because we utilize
+  // our own hints via the FileSizeReporter
+  performance: false
+});
+
+function getStyleLoaders(cssOptions = {}) {
+  return [
+    {
+      loader: MiniCssExtractPlugin.loader,
+      options: {
+        publicPath: '../'
+      }
+    },
+    {
+      loader: require.resolve('css-loader'),
+      options: cssOptions
+    },
+    {
+      loader: require.resolve('postcss-loader'),
+      options: {
+        postcssOptions: {
+          ident: 'postcss',
+          plugins: [
+            require('postcss-flexbugs-fixes'),
+            require('postcss-preset-env')({
+              autoprefixer: {
+                flexbox: 'no-2009'
+              },
+              stage: 3
+            }),
+            require('tailwindcss'),
+            require('autoprefixer')
+          ]
+        }
+      }
+    }
+  ].filter(Boolean);
+}
diff --git a/webpack/env.ts b/webpack/env.ts
new file mode 100644
index 0000000000..6693746a21
--- /dev/null
+++ b/webpack/env.ts
@@ -0,0 +1,59 @@
+type ProcessDotEnv = {
+  NODE_ENV: 'development' | 'production' | 'test';
+  TARGET_BROWSER: string;
+  SOURCE_MAP?: 'true' | 'false';
+  IMAGE_INLINE_SIZE_LIMIT?: string;
+};
+
+const {
+  NODE_ENV = 'development',
+  TARGET_BROWSER = 'chrome',
+  SOURCE_MAP: SOURCE_MAP_ENV,
+  IMAGE_INLINE_SIZE_LIMIT: IMAGE_INLINE_SIZE_LIMIT_ENV = '10000'
+} = process.env as ProcessDotEnv;
+
+const WEBPACK_MODE = NODE_ENV === 'test' ? 'none' : NODE_ENV;
+
+const DEVELOPMENT_ENV = NODE_ENV === 'development';
+const PRODUCTION_ENV = NODE_ENV === 'production';
+
+const SOURCE_MAP = NODE_ENV !== 'production' && SOURCE_MAP_ENV !== 'false';
+
+const DROP_CONSOLE_IN_PROD = true;
+
+const RELOADER_PORTS = {
+  BACKGROUND: 9090,
+  SCRIPTS: 9091,
+  PAGES: 9092
+};
+
+export const ALL_VENDORS = ['chrome', 'brave', 'firefox', 'opera', 'safari'] as const;
+
+export type Vendor = typeof ALL_VENDORS[number];
+
+const MANIFEST_VERSION_BY_VENDORS: Record<Vendor, 2 | 3> = {
+  chrome: 3,
+  brave: 3,
+  firefox: 2,
+  opera: 2,
+  safari: 2
+};
+
+export const getManifestVersion = (vendor: string) => MANIFEST_VERSION_BY_VENDORS[vendor as Vendor] || 2;
+
+const MANIFEST_VERSION = getManifestVersion(TARGET_BROWSER);
+const BACKGROUND_IS_WORKER = MANIFEST_VERSION === 3;
+
+export {
+  NODE_ENV,
+  WEBPACK_MODE,
+  DEVELOPMENT_ENV,
+  PRODUCTION_ENV,
+  TARGET_BROWSER,
+  SOURCE_MAP,
+  DROP_CONSOLE_IN_PROD,
+  MANIFEST_VERSION,
+  BACKGROUND_IS_WORKER,
+  IMAGE_INLINE_SIZE_LIMIT_ENV,
+  RELOADER_PORTS
+};
diff --git a/webpack/live-reload/client.ts b/webpack/live-reload/client.ts
new file mode 100644
index 0000000000..d6ebf18f04
--- /dev/null
+++ b/webpack/live-reload/client.ts
@@ -0,0 +1,12 @@
+export {};
+
+// @ts-ignore
+const port = __PAGE_LIVE_RELOAD_PORT__;
+
+const socket = new WebSocket('ws://localhost:' + port);
+
+socket.onmessage = event => {
+  if (event.data === 'RELOAD') {
+    window.location.reload();
+  }
+};
diff --git a/webpack/live-reload/index.ts b/webpack/live-reload/index.ts
new file mode 100644
index 0000000000..c73aafb0ec
--- /dev/null
+++ b/webpack/live-reload/index.ts
@@ -0,0 +1,59 @@
+// import fs from 'fs';
+import path from 'path';
+import type { Compiler } from 'webpack';
+import WebPack from 'webpack';
+import WebSocket, { Server as WebSocketServer } from 'ws';
+
+/**
+ * (i) Reloads all pages (entries) at once.
+ */
+const usePagesLiveReload = (port: number) => ({
+  plugins: [
+    new WebPack.DefinePlugin({
+      __PAGE_LIVE_RELOAD_PORT__: String(port)
+    }),
+    new ServerPlugin(port)
+  ],
+  client_entry: path.resolve(__dirname, 'client')
+});
+
+export default usePagesLiveReload;
+
+class ServerPlugin {
+  private reloadDelay: number;
+  private clients: { id: number; ws: WebSocket }[] = [];
+
+  /**
+   * @param delay // ms // Emit the RELOAD events `reloadDelay` ms after the webpack `done` hook
+   */
+  constructor(port: number, reloadDelay = 100) {
+    this.reloadDelay = reloadDelay;
+
+    const server = new WebSocketServer({ port });
+    server.on('connection', ws => {
+      const wsId = Date.now();
+      this.clients.push({ id: wsId, ws });
+      ws.onclose = () => {
+        const index = this.clients.findIndex(({ id }) => id === wsId);
+        if (index > -1) this.clients.splice(index, 1);
+      };
+    });
+  }
+
+  apply(compiler: Compiler) {
+    compiler.hooks.done.tap(
+      'PageLiveReload',
+      (_stats /* stats is passed as an argument when done hook is tapped */) => {
+        setTimeout(() => {
+          this.broadcast();
+        }, this.reloadDelay);
+      }
+    );
+  }
+
+  private broadcast() {
+    for (const { ws } of this.clients) {
+      ws.send('RELOAD');
+    }
+  }
+}
diff --git a/webpack/manifest.ts b/webpack/manifest.ts
new file mode 100644
index 0000000000..b8c2a0ed45
--- /dev/null
+++ b/webpack/manifest.ts
@@ -0,0 +1,168 @@
+/*
+  For the file format, see:
+  https://developer.chrome.com/docs/extensions/mv3/manifest
+*/
+
+import type { Manifest } from 'webextension-polyfill';
+
+import packageJSON from '../package.json';
+import { Vendor, ALL_VENDORS, getManifestVersion } from './env';
+
+const isKnownVendor = (vendor: string): vendor is Vendor => ALL_VENDORS.includes(vendor as Vendor);
+
+export const buildManifest = (vendor: string) => {
+  if (!isKnownVendor(vendor)) throw new Error('Vendor is unknown');
+
+  const manifestVersion = getManifestVersion(vendor);
+
+  /* Remove this, if want to start building differently for the Brave */
+  if (vendor === 'brave') vendor = 'chrome';
+
+  if (manifestVersion === 3) return buildManifestV3(vendor);
+  return buildManifestV2(vendor);
+};
+
+const buildManifestV3 = (vendor: string): Manifest.WebExtensionManifest => {
+  const commons = buildManifestCommons(vendor);
+
+  return {
+    manifest_version: 3,
+
+    ...commons,
+
+    permissions: PERMISSIONS,
+    host_permissions: HOST_PERMISSIONS,
+
+    content_security_policy: {
+      extension_pages: "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'"
+    },
+
+    action: buildBrowserAction(vendor),
+
+    options_ui: OPTIONS_UI,
+
+    background: {
+      service_worker: 'background/index.js'
+    }
+  };
+};
+
+const buildManifestV2 = (vendor: string): Manifest.WebExtensionManifest => {
+  const withVendors = makeWithVendors(vendor);
+
+  return {
+    manifest_version: 2,
+
+    ...buildManifestCommons(vendor),
+
+    permissions: [...PERMISSIONS, ...HOST_PERMISSIONS],
+
+    content_security_policy: "script-src 'self' 'unsafe-eval'; object-src 'self'",
+
+    browser_action: buildBrowserAction(vendor),
+
+    options_ui: {
+      ...OPTIONS_UI,
+      ...withVendors('chrome')({ chrome_style: false })
+    },
+
+    background: {
+      scripts: ['background/index.js'],
+      ...withVendors('chrome', 'opera')({ persistent: true })
+    }
+  };
+};
+
+const AUTHOR_URL = 'https://madfish.solutions';
+
+const PERMISSIONS = ['storage', 'unlimitedStorage', 'clipboardWrite', 'activeTab'];
+
+const HOST_PERMISSIONS: string[] = ['http://localhost:8732/'];
+
+const OPTIONS_UI = {
+  page: 'options.html',
+  open_in_tab: true
+};
+
+const buildManifestCommons = (vendor: string): Omit<Manifest.WebExtensionManifest, 'manifest_version'> => {
+  const withVendors = makeWithVendors(vendor);
+
+  return {
+    version: packageJSON.version,
+
+    name: 'Temple - Tezos Wallet',
+    short_name: 'Temple - Tezos Wallet',
+
+    icons: {
+      '16': 'misc/icon-16.png',
+      '19': 'misc/icon-19.png',
+      '38': 'misc/icon-38.png',
+      '128': 'misc/icon-128.png'
+    },
+
+    description: '__MSG_appDesc__',
+
+    default_locale: 'en',
+
+    ...withVendors(
+      'chrome',
+      'firefox',
+      'opera'
+    )({
+      homepage_url: 'https://github.com/madfish-solutions/templewallet-extension'
+    }),
+
+    ...withVendors('chrome', 'firefox')({ author: AUTHOR_URL }),
+    ...withVendors('opera')({
+      developer: { name: AUTHOR_URL }
+    }),
+
+    ...withVendors('firefox')({
+      applications: {
+        gecko: { id: '{34ac229e-1cf5-4e4c-8a77-988155c4360f}' }
+      }
+    }),
+
+    ...withVendors('chrome')({ minimum_chrome_version: '49' }),
+    ...withVendors('opera')({ minimum_opera_version: '36' }),
+
+    ...withVendors('chrome', 'opera')({ options_page: 'options.html' }),
+
+    content_scripts: [
+      {
+        matches: [
+          'http://localhost/*',
+          'http://127.0.0.1/*',
+          /* For some URLs from `HOST_PERMISSIONS` & active tabs (with `activeTab` permission) */
+          'https://*/*'
+        ],
+        js: ['scripts/contentScript.js'],
+        run_at: 'document_start',
+        all_frames: true
+      }
+    ]
+  };
+};
+
+const buildBrowserAction = (vendor: string) => {
+  const withVendors = makeWithVendors(vendor);
+
+  return {
+    default_title: 'Temple - Tezos Wallet',
+    ...withVendors('chrome', 'firefox', 'opera')({ default_popup: 'popup.html' }),
+    default_icon: {
+      '16': 'misc/icon-16.png',
+      '19': 'misc/icon-19.png',
+      '38': 'misc/icon-38.png',
+      '128': 'misc/icon-128.png'
+    },
+    ...withVendors('chrome', 'opera')({ chrome_style: false }),
+    ...withVendors('firefox')({ browser_style: false })
+  };
+};
+
+const makeWithVendors = (vendor: string) => {
+  return (...vendors: Vendor[]) => {
+    return <T extends object>(obj: T) => (vendors.includes(vendor as Vendor) ? obj : null);
+  };
+};
diff --git a/webpack/paths.ts b/webpack/paths.ts
new file mode 100644
index 0000000000..39a5d579c8
--- /dev/null
+++ b/webpack/paths.ts
@@ -0,0 +1,84 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import { NODE_ENV, TARGET_BROWSER } from './env';
+import { isTruthy } from './utils';
+
+const PACKED_EXTENSION = (() => {
+  switch (TARGET_BROWSER) {
+    case 'opera':
+      return 'crx';
+
+    case 'firefox':
+      return 'xpi';
+
+    default:
+      return 'zip';
+  }
+})();
+
+const DEST_RELATIVE_PATH_OUTPUT = `${TARGET_BROWSER}_unpacked`;
+const DEST_RELATIVE_PATH_OUTPUT_PACKED = `${TARGET_BROWSER}.${PACKED_EXTENSION}`;
+
+const PATH_CWD = fs.realpathSync(process.cwd());
+const PATH_NODE_MODULES = path.join(PATH_CWD, 'node_modules');
+const PATH_SOURCE = path.join(PATH_CWD, 'src');
+const PATH_PUBLIC = path.join(PATH_CWD, 'public');
+const PATH_DEST = path.join(PATH_CWD, 'dist');
+const PATH_OUTPUT = path.join(PATH_DEST, DEST_RELATIVE_PATH_OUTPUT);
+const PATH_OUTPUT_PACKED = path.join(PATH_DEST, DEST_RELATIVE_PATH_OUTPUT_PACKED);
+const PATH_OUTPUT_BACKGROUND = path.join(PATH_OUTPUT, 'background/');
+const PATH_OUTPUT_WASM = path.join(PATH_OUTPUT, 'wasm/');
+const PATH_LIBTHEMIS_WASM_FILE = path.join(PATH_NODE_MODULES, 'wasm-themis/src/libthemis.wasm');
+
+const DEST_RELATIVE_PATHS = {
+  OUTPUT: DEST_RELATIVE_PATH_OUTPUT,
+  OUTPUT_PACKED: DEST_RELATIVE_PATH_OUTPUT_PACKED
+};
+
+const PATHS = {
+  CWD: PATH_CWD,
+  NODE_MODULES: PATH_NODE_MODULES,
+  SOURCE: PATH_SOURCE,
+  PUBLIC: PATH_PUBLIC,
+  DEST: PATH_DEST,
+  OUTPUT: PATH_OUTPUT,
+  OUTPUT_PACKED: PATH_OUTPUT_PACKED,
+  OUTPUT_BACKGROUND: PATH_OUTPUT_BACKGROUND,
+  OUTPUT_WASM: PATH_OUTPUT_WASM,
+  LIBTHEMIS_WASM_FILE: PATH_LIBTHEMIS_WASM_FILE
+};
+
+const dotenvPath = path.resolve(PATH_CWD, '.env');
+
+// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
+const dotenvFiles = [
+  `${dotenvPath}.${NODE_ENV}.local`,
+  /*
+    Don't include `.env.local` for `test` environment
+    since normally you expect tests to produce the same
+    results for everyone
+  */
+  NODE_ENV !== 'test' && `${dotenvPath}.local`,
+  `${dotenvPath}.${NODE_ENV}`,
+  dotenvPath
+].filter(isTruthy);
+
+/*
+  Load environment variables from .env* files. Suppress warnings using silent
+  if this file is missing. dotenv will never modify any environment variables
+  that have already been set.  Variable expansion is supported in .env files.
+  - https://github.com/motdotla/dotenv
+  - https://github.com/motdotla/dotenv-expand
+*/
+dotenvFiles.forEach(dotenvFile => {
+  if (fs.existsSync(dotenvFile)) {
+    require('dotenv-expand')(
+      require('dotenv').config({
+        path: dotenvFile
+      })
+    );
+  }
+});
+
+export { DEST_RELATIVE_PATHS, PATHS };
diff --git a/webpack/plugins.d.ts b/webpack/plugins.d.ts
new file mode 100644
index 0000000000..f54318afcc
--- /dev/null
+++ b/webpack/plugins.d.ts
@@ -0,0 +1,3 @@
+declare module 'react-dev-utils/ForkTsCheckerWebpackPlugin';
+declare module 'react-dev-utils/ModuleNotFoundPlugin';
+declare module 'create-file-webpack';
diff --git a/webpack/tsconfig.json b/webpack/tsconfig.json
new file mode 100644
index 0000000000..c3e0f68673
--- /dev/null
+++ b/webpack/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../tsconfig.json",
+
+  "files": [ "../webpack.config.ts", "./plugins.d.ts" ],
+  "include": [ "./" ],
+
+  "compilerOptions": {
+    "baseUrl": ".",
+    "target": "ES5",
+    "module": "CommonJS"
+  }
+}
diff --git a/webpack/utils.ts b/webpack/utils.ts
new file mode 100644
index 0000000000..827be96f3e
--- /dev/null
+++ b/webpack/utils.ts
@@ -0,0 +1,4 @@
+/** From lodash */
+type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
+
+export const isTruthy = <T>(value: T): value is Truthy<T> => Boolean(value);
diff --git a/webpack/zip-script.ts b/webpack/zip-script.ts
new file mode 100644
index 0000000000..bb50880f5c
--- /dev/null
+++ b/webpack/zip-script.ts
@@ -0,0 +1,14 @@
+/*
+  There is no WebPack-based solution to zip output of multiple configurations.
+*/
+
+import * as path from 'path';
+import { zip } from 'zip-a-folder';
+
+import { PATHS } from './paths';
+
+const fileName = path.basename(PATHS.OUTPUT_PACKED);
+
+console.log(`Will zip as: ${fileName}`);
+
+zip(PATHS.OUTPUT, PATHS.OUTPUT_PACKED);
diff --git a/yarn.lock b/yarn.lock
index 205def9f8b..cf13a236c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29,14 +29,7 @@
     tslib "^2.3.0"
     zen-observable-ts "^1.2.5"
 
-"@babel/code-frame@7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.5.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -288,7 +281,7 @@
     "@babel/traverse" "^7.19.0"
     "@babel/types" "^7.19.0"
 
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
+"@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
   integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
@@ -297,7 +290,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.18.10", "@babel/parser@^7.19.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
+"@babel/parser@^7.1.0", "@babel/parser@^7.18.10", "@babel/parser@^7.19.3", "@babel/parser@^7.7.2":
   version "7.19.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a"
   integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==
@@ -1064,7 +1057,7 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.19.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.19.3", "@babel/traverse@^7.7.2":
   version "7.19.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4"
   integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==
@@ -1080,7 +1073,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.4", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.19.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.3.tgz#fc420e6bbe54880bce6779ffaf315f5e43ec9624"
   integrity sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==
@@ -1635,6 +1628,18 @@
     tslib "^2.1.0"
     webcrypto-core "^1.2.0"
 
+"@pkgr/utils@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03"
+  integrity sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==
+  dependencies:
+    cross-spawn "^7.0.3"
+    is-glob "^4.0.3"
+    open "^8.4.0"
+    picocolors "^1.0.0"
+    tiny-glob "^0.2.9"
+    tslib "^2.4.0"
+
 "@popperjs/core@2.4.4", "@popperjs/core@^2.4.4":
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398"
@@ -2215,6 +2220,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
 "@types/bs58check@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/bs58check/-/bs58check-2.1.0.tgz#7d25a8b88fe7a9e315d2647335ee3c43c8fdb0c0"
@@ -2222,6 +2235,29 @@
   dependencies:
     "@types/node" "*"
 
+"@types/clean-css@*":
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.6.tgz#48b427285b2b654751a9bbc6f7d35e6173dec8d2"
+  integrity sha512-Ze1tf+LnGPmG6hBFMi0B4TEB0mhF7EiMM5oyjLDNPE9hxrPU0W+5+bHvO+eFPA+bt0iC1zkQMoU/iGdRVjcRbw==
+  dependencies:
+    "@types/node" "*"
+    source-map "^0.6.0"
+
+"@types/connect-history-api-fallback@*":
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/debounce-promise@3.1.4":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/debounce-promise/-/debounce-promise-3.1.4.tgz#bf10eead11724e666ea541df1c9d3969677a505b"
@@ -2260,6 +2296,25 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
+  version "4.17.31"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f"
+  integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@*":
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c"
+  integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/fontfaceobserver@0.0.6":
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/@types/fontfaceobserver/-/fontfaceobserver-0.0.6.tgz#14a4a02b77e66e6a1070622981d431c885a174ed"
@@ -2293,6 +2348,31 @@
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
   integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
+"@types/html-minifier@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/html-minifier/-/html-minifier-4.0.2.tgz#ea0b927ad0019821a2e9d14ba9c57d105b63cecc"
+  integrity sha512-4IkmkXJP/25R2fZsCHDX2abztXuQRzUAZq39PfCMz2loLFj8vS9y7aF6vDl58koXSTpsF+eL4Lc5Y4Aww/GCTQ==
+  dependencies:
+    "@types/clean-css" "*"
+    "@types/relateurl" "*"
+    "@types/uglify-js" "*"
+
+"@types/html-webpack-plugin@*":
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/@types/html-webpack-plugin/-/html-webpack-plugin-3.2.6.tgz#07951aaf0fa260dbf626f9644f1d13106d537625"
+  integrity sha512-U8uJSvlf9lwrKG6sKFnMhqY4qJw2QXad+PHlX9sqEXVUMilVt96aVvFde73tzsdXD+QH9JS6kEytuGO2JcYZog==
+  dependencies:
+    "@types/html-minifier" "*"
+    "@types/tapable" "^1"
+    "@types/webpack" "^4"
+
+"@types/http-proxy@^1.17.5":
+  version "1.17.9"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
+  integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
@@ -2320,7 +2400,7 @@
     jest-diff "^27.0.0"
     pretty-format "^27.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -2357,6 +2437,11 @@
   resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.8.tgz#34575d7692fdbb7a7fdb63afcde381db86ec0de2"
   integrity sha512-vkDSj6enD3K0+Ep83wnoGUk+f7sqsO4alsqxxEZ8BcTJhFmcY4UehYH3rTf4M3JGHXNhdpGFDdMbWFMgyvw/fA==
 
+"@types/mime@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+  integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -2379,10 +2464,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a"
   integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==
 
-"@types/node@14.0.27":
-  version "14.0.27"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
-  integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
+"@types/node@16.11.7":
+  version "16.11.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42"
+  integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -2399,6 +2484,16 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
   integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
 
+"@types/qs@*":
+  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/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
 "@types/react-collapse@5.0.1":
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/@types/react-collapse/-/react-collapse-5.0.1.tgz#078ea1ad15e00ba2063f2e4d8d6760c9375a2023"
@@ -2406,6 +2501,17 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-dev-utils@^9.0.11":
+  version "9.0.11"
+  resolved "https://registry.yarnpkg.com/@types/react-dev-utils/-/react-dev-utils-9.0.11.tgz#0dff59c60b5011df0f851e5ec4c831cf07300ba3"
+  integrity sha512-SdHtle/1hyImI1VzJUp20pthFwHY2O0Pq5QWIbPyku0SboPxqbyfwFwOlrr5d4yiZRr1in7SQ4Z0IiJVrJiJrg==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/express" "*"
+    "@types/html-webpack-plugin" "*"
+    "@types/webpack" "^4"
+    "@types/webpack-dev-server" "3"
+
 "@types/react-dom@18.0.6":
   version "18.0.6"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.6.tgz#36652900024842b74607a17786b6662dd1e103a1"
@@ -2458,6 +2564,16 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/relateurl@*":
+  version "0.2.29"
+  resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.29.tgz#68ccecec3d4ffdafb9c577fe764f912afc050fe6"
+  integrity sha512-QSvevZ+IRww2ldtfv1QskYsqVVVwCKQf1XbwtcyyoRvLIQzfyPhj/C+3+PKzSDRdiyejaiLgnq//XTkleorpLg==
+
+"@types/resolve@^1.20.2":
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
+  integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==
+
 "@types/retry@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
@@ -2475,6 +2591,19 @@
   dependencies:
     "@types/node" "*"
 
+"@types/semver@^7.3.12":
+  version "7.3.13"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+
+"@types/serve-static@*":
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155"
+  integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==
+  dependencies:
+    "@types/mime" "*"
+    "@types/node" "*"
+
 "@types/sha.js@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/sha.js/-/sha.js-2.4.0.tgz#bce682ef860b40f419d024fa08600c3b8d24bb01"
@@ -2492,6 +2621,11 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
+"@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/typedarray-to-buffer@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@types/typedarray-to-buffer/-/typedarray-to-buffer-4.0.0.tgz#3de70adbfa811345e713d044767bd8fad9f522ee"
@@ -2499,6 +2633,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/uglify-js@*":
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.1.tgz#e0ffcef756476410e5bce2cb01384ed878a195b5"
+  integrity sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==
+  dependencies:
+    source-map "^0.6.1"
+
 "@types/use-sync-external-store@^0.0.3":
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43"
@@ -2509,7 +2650,7 @@
   resolved "https://registry.yarnpkg.com/@types/w3c-web-hid/-/w3c-web-hid-1.0.3.tgz#e08587a7d737f8654ea6bc0a88689ce5d3ce2d19"
   integrity sha512-eTQRkPd2JukZfS9+kRtrBAaTCCb6waGh5X8BJHmH1MiVQPLMYwm4+EvhwFfOo9SDna15o9dFAwmWwN6r/YM53A==
 
-"@types/webextension-polyfill@^0.8.2":
+"@types/webextension-polyfill@^0.8.2", "@types/webextension-polyfill@^0.8.3":
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/@types/webextension-polyfill/-/webextension-polyfill-0.8.3.tgz#eb601b3fcf524f0ecf7d7579ccbd237928d0dda7"
   integrity sha512-GN+Hjzy9mXjWoXKmaicTegv3FJ0WFZ3aYz77Wk8TMp1IY3vEzvzj1vnsa0ggV7vMI1i+PUxe4qqnIJKCzf9aTg==
@@ -2519,7 +2660,18 @@
   resolved "https://registry.yarnpkg.com/@types/webextension-polyfill/-/webextension-polyfill-0.9.1.tgz#fcb5c352e2e461d0287774db89bc326b15b47844"
   integrity sha512-6aNzPIhqKlAV9t06nwSH3/veAceYE2dS2RVFZI8V1+UXHqsFNB6cRwxNmheiBvEGRc45E/gyZNzH0xAYIC27KA==
 
-"@types/webpack-sources@^3.2.0":
+"@types/webpack-dev-server@3":
+  version "3.11.6"
+  resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz#d8888cfd2f0630203e13d3ed7833a4d11b8a34dc"
+  integrity sha512-XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ==
+  dependencies:
+    "@types/connect-history-api-fallback" "*"
+    "@types/express" "*"
+    "@types/serve-static" "*"
+    "@types/webpack" "^4"
+    http-proxy-middleware "^1.0.0"
+
+"@types/webpack-sources@*", "@types/webpack-sources@^3.2.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b"
   integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==
@@ -2528,6 +2680,18 @@
     "@types/source-list-map" "*"
     source-map "^0.7.3"
 
+"@types/webpack@^4":
+  version "4.41.33"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.33.tgz#16164845a5be6a306bcbe554a8e67f9cac215ffc"
+  integrity sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==
+  dependencies:
+    "@types/node" "*"
+    "@types/tapable" "^1"
+    "@types/uglify-js" "*"
+    "@types/webpack-sources" "*"
+    anymatch "^3.0.0"
+    source-map "^0.6.0"
+
 "@types/webpack@^5.28.0":
   version "5.28.0"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03"
@@ -2537,6 +2701,13 @@
     tapable "^2.2.0"
     webpack "^5"
 
+"@types/ws@^7.4.6":
+  version "7.4.7"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.7.tgz#f7c390a36f7a0679aa69de2d501319f4f8d9b702"
+  integrity sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==
+  dependencies:
+    "@types/node" "*"
+
 "@types/yargs-parser@*":
   version "21.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
@@ -2556,16 +2727,17 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz#ac919a199548861012e8c1fb2ec4899ac2bc22ae"
-  integrity sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==
+"@typescript-eslint/eslint-plugin@^5.43.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.43.0.tgz#4a5248eb31b454715ddfbf8cfbf497529a0a78bc"
+  integrity sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.38.0"
-    "@typescript-eslint/type-utils" "5.38.0"
-    "@typescript-eslint/utils" "5.38.0"
+    "@typescript-eslint/scope-manager" "5.43.0"
+    "@typescript-eslint/type-utils" "5.43.0"
+    "@typescript-eslint/utils" "5.43.0"
     debug "^4.3.4"
     ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
     regexpp "^3.2.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
@@ -2591,34 +2763,16 @@
   dependencies:
     "@typescript-eslint/utils" "5.39.0"
 
-"@typescript-eslint/parser@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.38.0.tgz#5a59a1ff41a7b43aacd1bb2db54f6bf1c02b2ff8"
-  integrity sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.38.0"
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/typescript-estree" "5.38.0"
-    debug "^4.3.4"
-
-"@typescript-eslint/parser@^5.5.0":
-  version "5.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.39.0.tgz#93fa0bc980a3a501e081824f6097f7ca30aaa22b"
-  integrity sha512-PhxLjrZnHShe431sBAGHaNe6BDdxAASDySgsBCGxcBecVCi8NQWxQZMcizNA4g0pN51bBAn/FUfkWG3SDVcGlA==
+"@typescript-eslint/parser@^5.43.0", "@typescript-eslint/parser@^5.5.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.43.0.tgz#9c86581234b88f2ba406f0b99a274a91c11630fd"
+  integrity sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.39.0"
-    "@typescript-eslint/types" "5.39.0"
-    "@typescript-eslint/typescript-estree" "5.39.0"
+    "@typescript-eslint/scope-manager" "5.43.0"
+    "@typescript-eslint/types" "5.43.0"
+    "@typescript-eslint/typescript-estree" "5.43.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz#8f0927024b6b24e28671352c93b393a810ab4553"
-  integrity sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==
-  dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/visitor-keys" "5.38.0"
-
 "@typescript-eslint/scope-manager@5.39.0":
   version "5.39.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.39.0.tgz#873e1465afa3d6c78d8ed2da68aed266a08008d0"
@@ -2627,15 +2781,13 @@
     "@typescript-eslint/types" "5.39.0"
     "@typescript-eslint/visitor-keys" "5.39.0"
 
-"@typescript-eslint/type-utils@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz#c8b7f681da825fcfc66ff2b63d70693880496876"
-  integrity sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==
+"@typescript-eslint/scope-manager@5.43.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz#566e46303392014d5d163704724872e1f2dd3c15"
+  integrity sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.38.0"
-    "@typescript-eslint/utils" "5.38.0"
-    debug "^4.3.4"
-    tsutils "^3.21.0"
+    "@typescript-eslint/types" "5.43.0"
+    "@typescript-eslint/visitor-keys" "5.43.0"
 
 "@typescript-eslint/type-utils@5.39.0":
   version "5.39.0"
@@ -2647,28 +2799,25 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.0.tgz#8cd15825e4874354e31800dcac321d07548b8a5f"
-  integrity sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==
+"@typescript-eslint/type-utils@5.43.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.43.0.tgz#91110fb827df5161209ecca06f70d19a96030be6"
+  integrity sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.43.0"
+    "@typescript-eslint/utils" "5.43.0"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
 
 "@typescript-eslint/types@5.39.0":
   version "5.39.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.39.0.tgz#f4e9f207ebb4579fd854b25c0bf64433bb5ed78d"
   integrity sha512-gQMZrnfEBFXK38hYqt8Lkwt8f4U6yq+2H5VDSgP/qiTzC8Nw8JO3OuSUOQ2qW37S/dlwdkHDntkZM6SQhKyPhw==
 
-"@typescript-eslint/typescript-estree@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz#89f86b2279815c6fb7f57d68cf9b813f0dc25d98"
-  integrity sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==
-  dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/visitor-keys" "5.38.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@5.43.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.43.0.tgz#e4ddd7846fcbc074325293515fa98e844d8d2578"
+  integrity sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg==
 
 "@typescript-eslint/typescript-estree@5.39.0":
   version "5.39.0"
@@ -2683,17 +2832,18 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.38.0.tgz#5b31f4896471818153790700eb02ac869a1543f4"
-  integrity sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==
+"@typescript-eslint/typescript-estree@5.43.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz#b6883e58ba236a602c334be116bfc00b58b3b9f2"
+  integrity sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==
   dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.38.0"
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/typescript-estree" "5.38.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
+    "@typescript-eslint/types" "5.43.0"
+    "@typescript-eslint/visitor-keys" "5.43.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
 
 "@typescript-eslint/utils@5.39.0", "@typescript-eslint/utils@^5.13.0":
   version "5.39.0"
@@ -2707,13 +2857,19 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz#60591ca3bf78aa12b25002c0993d067c00887e34"
-  integrity sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==
+"@typescript-eslint/utils@5.43.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.43.0.tgz#00fdeea07811dbdf68774a6f6eacfee17fcc669f"
+  integrity sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A==
   dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    eslint-visitor-keys "^3.3.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.43.0"
+    "@typescript-eslint/types" "5.43.0"
+    "@typescript-eslint/typescript-estree" "5.43.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+    semver "^7.3.7"
 
 "@typescript-eslint/visitor-keys@5.39.0":
   version "5.39.0"
@@ -2723,6 +2879,14 @@
     "@typescript-eslint/types" "5.39.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.43.0":
+  version "5.43.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz#cbbdadfdfea385310a20a962afda728ea106befa"
+  integrity sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg==
+  dependencies:
+    "@typescript-eslint/types" "5.43.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@vespaiach/axios-fetch-adapter@^0.3.1":
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/@vespaiach/axios-fetch-adapter/-/axios-fetch-adapter-0.3.1.tgz#b0c08167bec9cc558f578a1b9ccff52ead1cf1cb"
@@ -2849,22 +3013,20 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
-  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
+"@webpack-cli/configtest@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.0.tgz#5e1bc37064c7d00e1330641fa523f8ff85a39513"
+  integrity sha512-war4OU8NGjBqU3DP3bx6ciODXIh7dSXcpQq+P4K2Tqyd8L5OjZ7COx9QXx/QdCIwL2qoX09Wr4Cwf7uS4qdEng==
 
-"@webpack-cli/info@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
-  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
-  dependencies:
-    envinfo "^7.7.3"
+"@webpack-cli/info@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.0.tgz#5a58476b129ee9b462117b23393596e726bf3b80"
+  integrity sha512-NNxDgbo4VOkNhOlTgY0Elhz3vKpOJq4/PKeKg7r8cmYM+GQA9vDofLYyup8jS6EpUvhNmR30cHTCEIyvXpskwA==
 
-"@webpack-cli/serve@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
-  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
+"@webpack-cli/serve@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.0.tgz#f08ea194e01ed45379383a8886e8c85a65a5f26a"
+  integrity sha512-Rumq5mHvGXamnOh3O8yLk1sjx8dB30qF1OeR6VC00DIR6SLJ4bwwUGKC4pE7qBFoQyyh0H9sAg3fikYgAqVR0w==
 
 "@wry/context@^0.7.0":
   version "0.7.0"
@@ -2949,11 +3111,16 @@ acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
-address@1.1.2, address@^1.0.1:
+address@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
+address@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.2.1.tgz#25bb61095b7522d65b357baa11bc05492d4c8acd"
+  integrity sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -2968,7 +3135,7 @@ ajv-formats@^2.1.1:
   dependencies:
     ajv "^8.0.0"
 
-ajv-keywords@^3.5.2:
+ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
@@ -2980,7 +3147,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3021,7 +3188,7 @@ ansi-escapes@^4.2.1:
   dependencies:
     type-fest "^0.11.0"
 
-ansi-regex@5.0.1, ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@5.0.1, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -3045,7 +3212,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@^3.0.0, anymatch@^3.0.3, 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==
@@ -3053,6 +3220,35 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+archiver-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
+  integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
+  dependencies:
+    glob "^7.1.4"
+    graceful-fs "^4.2.0"
+    lazystream "^1.0.0"
+    lodash.defaults "^4.2.0"
+    lodash.difference "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.isplainobject "^4.0.6"
+    lodash.union "^4.6.0"
+    normalize-path "^3.0.0"
+    readable-stream "^2.0.0"
+
+archiver@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.1.tgz#21e92811d6f09ecfce649fbefefe8c79e57cbbb6"
+  integrity sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==
+  dependencies:
+    archiver-utils "^2.1.0"
+    async "^3.2.3"
+    buffer-crc32 "^0.2.1"
+    readable-stream "^3.6.0"
+    readdir-glob "^1.0.0"
+    tar-stream "^2.2.0"
+    zip-stream "^4.1.0"
+
 are-passive-events-supported@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/are-passive-events-supported/-/are-passive-events-supported-1.1.1.tgz#3db180a1753a2186a2de50a32cded3ac0979f5dc"
@@ -3088,11 +3284,6 @@ aria-query@^4.2.2:
     "@babel/runtime" "^7.10.2"
     "@babel/runtime-corejs3" "^7.10.2"
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
 arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
@@ -3202,11 +3393,21 @@ async-retry@1.3.3:
   dependencies:
     retry "0.13.1"
 
+async@^3.2.3:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -3224,7 +3425,7 @@ autoprefixer@10.4.2, autoprefixer@^10.4.2:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-axe-core@^4.3.5, axe-core@^4.4.3:
+axe-core@^4.4.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
   integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==
@@ -3255,18 +3456,6 @@ axobject-query@^2.2.0:
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
-babel-eslint@10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
 babel-jest@^27.4.5:
   version "27.4.5"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.4.5.tgz#d38bd0be8ea71d8b97853a5fc9f76deeb095c709"
@@ -3383,7 +3572,7 @@ babel-preset-jest@^27.4.0:
     babel-plugin-jest-hoist "^27.4.0"
     babel-preset-current-node-syntax "^1.0.0"
 
-babel-preset-react-app@10.0.1, babel-preset-react-app@^10.0.1:
+babel-preset-react-app@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz#ed6005a20a24f2c88521809fa9aea99903751584"
   integrity sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==
@@ -3480,6 +3669,15 @@ bip39@3.0.4, bip39@^3.0.4:
     pbkdf2 "^3.0.9"
     randombytes "^2.0.1"
 
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 blakejs@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814"
@@ -3508,6 +3706,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
@@ -3526,22 +3731,6 @@ braces@2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
@@ -3613,7 +3802,7 @@ browserify-sign@^4.0.0:
     readable-stream "^3.6.0"
     safe-buffer "^5.2.0"
 
-browserslist@4.14.2, browserslist@4.16.5, browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.19.1, browserslist@^4.20.3, browserslist@^4.21.3, browserslist@^4.21.4:
+browserslist@4.16.5, browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.18.1, browserslist@^4.19.1, browserslist@^4.20.3, browserslist@^4.21.3, browserslist@^4.21.4:
   version "4.16.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
   integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
@@ -3654,10 +3843,10 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-crc32@~0.2.3:
+buffer-crc32@^0.2.1, buffer-crc32@^0.2.13:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
 buffer-from@^1.0.0:
   version "1.1.1"
@@ -3677,6 +3866,14 @@ buffer@5.6.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 buffer@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
@@ -3761,7 +3958,7 @@ canvas-renderer@~2.1.1:
   resolved "https://registry.yarnpkg.com/canvas-renderer/-/canvas-renderer-2.1.1.tgz#d91fe9511ab48056ff9fa8a04514bede76535f55"
   integrity sha512-/V0XetN7s1Mk3NO7x2wxPZYv0pLMQtGAhecuOuKR88beiYCUle1AbCcFZNLu+4NVzi9RVHS0rXtIgzPEaKidLw==
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3770,7 +3967,7 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3788,7 +3985,7 @@ charenc@0.0.2:
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
   integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
 
-chokidar@^3.5.2:
+chokidar@^3.4.2, chokidar@^3.5.2:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
@@ -3810,11 +4007,6 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
-  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
-
 ci-info@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
@@ -3990,7 +4182,7 @@ commander@^6.2.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
-commander@^7.0.0, commander@^7.2.0:
+commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -4000,6 +4192,11 @@ commander@^8.0.0, commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -4015,6 +4212,16 @@ component-type@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-type/-/component-type-1.2.1.tgz#8a47901700238e4fc32269771230226f24b415a9"
   integrity sha1-ikeQFwAjjk/DIml3EjAibyS0Fak=
 
+compress-commons@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d"
+  integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==
+  dependencies:
+    buffer-crc32 "^0.2.13"
+    crc32-stream "^4.0.2"
+    normalize-path "^3.0.0"
+    readable-stream "^3.6.0"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -4025,10 +4232,10 @@ confusing-browser-globals@^1.0.11:
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
-consola@^2.10.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.0.tgz#40fc4eefa4d2f8ef2e2806147f056ea207fcc0e9"
-  integrity sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ==
+consola@^2.15.3:
+  version "2.15.3"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
+  integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
 constate@3.3.2:
   version "3.3.2"
@@ -4071,6 +4278,22 @@ core-js-pure@^3.0.0:
   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-util-is@~1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
+cosmiconfig@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.7.2"
+
 cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
@@ -4082,6 +4305,19 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+crc-32@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
+crc32-stream@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007"
+  integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==
+  dependencies:
+    crc-32 "^1.2.0"
+    readable-stream "^3.4.0"
+
 create-ecdh@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
@@ -4090,6 +4326,14 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.5.3"
 
+create-file-webpack@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/create-file-webpack/-/create-file-webpack-1.0.2.tgz#c206474fe15a6aab12e2a278a7798d244befff0b"
+  integrity sha512-+J6kQTE+Wcobc6gHP8E2zmoeIC+J+p6IXqjFrzoxCl1VYlimWoincPUABAhODuXAJGrZcNZ/Up0PTqq1ISiwvA==
+  dependencies:
+    path "^0.12.7"
+    write "^1.0.3"
+
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -4132,15 +4376,6 @@ cross-fetch@^3.0.4:
   dependencies:
     node-fetch "2.6.1"
 
-cross-spawn@7.0.3, cross-spawn@^7.0.1, 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"
-
 cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -4152,6 +4387,15 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.1, 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"
@@ -4351,7 +4595,7 @@ csstype@^3.0.2:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz#2b410bbeba38ba9633353aff34b05d9755d065f8"
   integrity sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag==
 
-damerau-levenshtein@^1.0.7, damerau-levenshtein@^1.0.8:
+damerau-levenshtein@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
@@ -4382,7 +4626,7 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   dependencies:
     ms "2.1.2"
 
-debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
+debug@^2.2.0, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4429,6 +4673,11 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
+define-lazy-prop@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+
 define-properties@^1.1.3, define-properties@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
@@ -4495,7 +4744,7 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-detect-port-alt@1.1.6:
+detect-port-alt@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
   integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==
@@ -4637,7 +4886,7 @@ dotenv@8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-duplexer@^0.1.1:
+duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
@@ -4694,6 +4943,13 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
+end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 enhanced-resolve@^5.10.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
@@ -4780,16 +5036,16 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -4835,16 +5091,18 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-import-resolver-typescript@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.4.0.tgz#ec1e7063ebe807f0362a7320543aaed6fe1100e1"
-  integrity sha512-useJKURidCcldRLCNKWemr1fFQL1SzB3G4a0li6lFGvlc5xGe1hY343bvG07cbpCzPuM/lK19FIJB3XGFSkplA==
+eslint-import-resolver-typescript@^3:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.2.tgz#9431acded7d898fd94591a08ea9eec3514c7de91"
+  integrity sha512-zX4ebnnyXiykjhcBvKIf5TNvt8K7yX6bllTRZ14MiurKPjDpCAZujlszTdB8pcNXhZcOf+god4s9SjQa5GnytQ==
   dependencies:
-    debug "^4.1.1"
-    glob "^7.1.6"
-    is-glob "^4.0.1"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+    debug "^4.3.4"
+    enhanced-resolve "^5.10.0"
+    get-tsconfig "^4.2.0"
+    globby "^13.1.2"
+    is-core-module "^2.10.0"
+    is-glob "^4.0.3"
+    synckit "^0.8.4"
 
 eslint-module-utils@^2.7.3:
   version "2.7.4"
@@ -4853,14 +5111,6 @@ eslint-module-utils@^2.7.3:
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-flowtype@5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz#7764cc63940f215bf3f0bd2d9a1293b2b9b2b4bb"
-  integrity sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==
-  dependencies:
-    lodash "^4.17.15"
-    string-natural-compare "^3.0.1"
-
 eslint-plugin-flowtype@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz#e1557e37118f24734aa3122e7536a038d34a4912"
@@ -4895,24 +5145,6 @@ eslint-plugin-jest@^25.3.0:
   dependencies:
     "@typescript-eslint/experimental-utils" "^5.0.0"
 
-eslint-plugin-jsx-a11y@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8"
-  integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==
-  dependencies:
-    "@babel/runtime" "^7.16.3"
-    aria-query "^4.2.2"
-    array-includes "^3.1.4"
-    ast-types-flow "^0.0.7"
-    axe-core "^4.3.5"
-    axobject-query "^2.2.0"
-    damerau-levenshtein "^1.0.7"
-    emoji-regex "^9.2.2"
-    has "^1.0.3"
-    jsx-ast-utils "^3.2.1"
-    language-tags "^1.0.5"
-    minimatch "^3.0.4"
-
 eslint-plugin-jsx-a11y@^6.5.1:
   version "6.6.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff"
@@ -4932,19 +5164,19 @@ eslint-plugin-jsx-a11y@^6.5.1:
     minimatch "^3.1.2"
     semver "^6.3.0"
 
-eslint-plugin-prettier@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
-  integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
+eslint-plugin-prettier@^4:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-react-hooks@4.6.0, eslint-plugin-react-hooks@^4.3.0:
+eslint-plugin-react-hooks@^4.3.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3"
   integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==
 
-eslint-plugin-react@^7.27.1, eslint-plugin-react@^7.31.8:
+eslint-plugin-react@^7.27.1:
   version "7.31.8"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz#3a4f80c10be1bcbc8197be9e8b641b2a3ef219bf"
   integrity sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==
@@ -4994,11 +5226,6 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
 eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
@@ -5109,6 +5336,11 @@ eventemitter3@^2.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
   integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
 
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
 events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -5147,19 +5379,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 expect@^27.4.2:
   version "27.4.2"
   resolved "https://registry.yarnpkg.com/expect/-/expect-27.4.2.tgz#4429b0f7e307771d176de9bdf23229b101db6ef6"
@@ -5187,20 +5406,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 fast-deep-equal@3.1.3, fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -5211,7 +5416,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9:
+fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -5281,13 +5486,6 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -5303,10 +5501,10 @@ file-loader@6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-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@^8.0.6:
+  version "8.0.7"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
+  integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -5341,7 +5539,14 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -5349,12 +5554,13 @@ find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+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 "^3.0.0"
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
 
 flat-cache@^3.0.4:
   version "3.0.4"
@@ -5377,7 +5583,7 @@ flux@^4.0.1:
     fbemitter "^3.0.0"
     fbjs "^3.0.1"
 
-follow-redirects@1.14.8, follow-redirects@^1.14.0, follow-redirects@^1.14.8:
+follow-redirects@1.14.8, follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.8:
   version "1.14.8"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
   integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
@@ -5392,18 +5598,24 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-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==
+fork-ts-checker-webpack-plugin@^6.5.0:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz#4f67183f2f9eb8ba7df7177ce3cf3e75cdafb340"
+  integrity sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==
   dependencies:
-    "@babel/code-frame" "^7.5.5"
-    chalk "^2.4.1"
-    micromatch "^3.1.10"
+    "@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"
-    semver "^5.6.0"
+    schema-utils "2.7.0"
+    semver "^7.3.2"
     tapable "^1.0.0"
-    worker-rpc "^0.1.0"
 
 form-data@^3.0.0:
   version "3.0.1"
@@ -5419,12 +5631,10 @@ fraction.js@^4.1.2:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.3.tgz#be65b0f20762ef27e1e793860bc2dfb716e99e65"
   integrity sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==
 
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
 fs-extra@^10.0.0:
   version "10.0.0"
@@ -5435,6 +5645,21 @@ fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^9.0.0:
+  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-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.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -5512,6 +5737,11 @@ get-symbol-description@^1.0.0:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
+get-tsconfig@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.2.0.tgz#ff368dd7104dab47bf923404eb93838245c66543"
+  integrity sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -5529,7 +5759,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -5541,7 +5771,19 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-modules@2.0.0:
+glob@^7.1.6:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
   integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
@@ -5569,19 +5811,12 @@ globals@^13.15.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
-    slash "^3.0.0"
+globalyzer@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
+  integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
 
-globby@^11.1.0:
+globby@^11.0.4, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -5593,7 +5828,7 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^13.1.1:
+globby@^13.1.1, globby@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515"
   integrity sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==
@@ -5615,6 +5850,11 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globrex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
@@ -5632,13 +5872,12 @@ graphql@^16.6.0:
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb"
   integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==
 
-gzip-size@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
-  integrity sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==
+gzip-size@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
   dependencies:
-    duplexer "^0.1.1"
-    pify "^4.0.1"
+    duplexer "^0.1.2"
 
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
@@ -5805,7 +6044,7 @@ 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@5.5.0:
+html-webpack-plugin@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50"
   integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==
@@ -5835,6 +6074,26 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
+http-proxy-middleware@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
+  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
+  dependencies:
+    "@types/http-proxy" "^1.17.5"
+    http-proxy "^1.18.1"
+    is-glob "^4.0.1"
+    is-plain-obj "^3.0.0"
+    micromatch "^4.0.2"
+
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
 https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
@@ -5867,22 +6126,22 @@ idna-uts46-hx@3.3.1, idna-uts46-hx@^3.3.0:
   dependencies:
     punycode "^2.1.1"
 
-ieee754@^1.1.4, ieee754@^1.2.1:
+ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.4, ignore@^5.2.0:
+ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
-immer@8.0.1, immer@9.0.7, immer@^9.0.7:
+immer@9.0.7, immer@^9.0.7:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.7.tgz#b6156bd7db55db7abc73fd2fdadf4e579a701075"
   integrity sha512-KGllzpbamZDvOIxnmJ0jI840g7Oikx58lBPWV0hUh7dtAyZpFqqrBZdKka5GlTwMTZ1Tjc/bKKW4VSFAt6BqMA==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -5911,7 +6170,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.4:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5945,10 +6204,10 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-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==
+interpret@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -6018,6 +6277,13 @@ is-color-stop@^1.1.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.10.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.2.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
@@ -6067,6 +6333,11 @@ is-docker@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
   integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
 
+is-docker@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -6144,6 +6415,11 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
+is-plain-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
+
 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"
@@ -6169,7 +6445,7 @@ is-retry-allowed@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
   integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
 
-is-root@2.1.0:
+is-root@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
   integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
@@ -6212,19 +6488,14 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^2.1.1:
+is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
   dependencies:
     is-docker "^2.0.0"
 
-isarray@1.0.0:
+isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
@@ -6851,7 +7122,7 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1, jsx-ast-utils@^3.3.2:
+"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea"
   integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==
@@ -6905,6 +7176,13 @@ language-tags@^1.0.5:
   dependencies:
     language-subtag-registry "~0.3.2"
 
+lazystream@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
+  dependencies:
+    readable-stream "^2.0.5"
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -6963,7 +7241,7 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-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==
@@ -6972,6 +7250,11 @@ loader-utils@2.0.0, loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
+loader-utils@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
+  integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
+
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -6987,6 +7270,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"
+
 lodash.curry@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
@@ -6997,11 +7287,31 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
+lodash.defaults@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
+
+lodash.difference@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+  integrity sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
+
 lodash.flow@^3.3.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
   integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=
 
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==
+
 lodash.isstring@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
@@ -7022,12 +7332,17 @@ lodash.topath@^4.5.2:
   resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009"
   integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=
 
+lodash.union@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+  integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==
+
 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@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7122,6 +7437,13 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
+memfs@^3.1.2:
+  version "3.4.11"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.11.tgz#3a34837ade675825d805a2c135e88cefe5e53aaf"
+  integrity sha512-GvsCITGAyDCxxsJ+X6prJexFQEhOCJaIlUbsAvjzSI5o5O7j2dle3jWvz5Z5aOdpOxW6ol3vI1+0ut+641F1+w==
+  dependencies:
+    fs-monkey "^1.0.3"
+
 memorystream@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
@@ -7142,31 +7464,7 @@ micro-memoize@4.0.9:
   resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.0.9.tgz#b44a38c9dffbee1cefc2fd139bc8947952268b62"
   integrity sha512-Z2uZi/IUMGQDCXASdujXRqrXXEwSY0XffUrAOllhqzQI3wpUyZbiZTiE2JuYC0HSG2G7DbCS5jZmsEKEGZuemg==
 
-microevent.ts@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
-  integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
-
-micromatch@^3.1.10:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -7221,20 +7519,20 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.4, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.1.tgz#6c9dffcf9927ff2a31e74b5af11adf8b9604b022"
+  integrity sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
@@ -7253,6 +7551,13 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mkdirp@^0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
 mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -7283,22 +7588,10 @@ nanoid@3.1.31, nanoid@^3.1.25, nanoid@^3.3.4:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.31.tgz#f5b58a1ce1b7604da5f0605757840598d8974dc6"
   integrity sha512-ZivnJm0o9bb13p2Ot5CpgC2rQdzB9Uxm/mFZweqm5eMViqOJe3PV6LU2E30SiLgheesmcPrjquqraoolONSA0A==
 
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -7495,13 +7788,6 @@ object.hasown@^1.1.1:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
 object.values@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
@@ -7519,7 +7805,7 @@ omit-deep@0.3.0:
     is-plain-object "^2.0.1"
     unset-value "^0.1.1"
 
-once@^1.3.0:
+once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -7533,13 +7819,14 @@ onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^7.0.2:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
-  integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
+open@^8.4.0:
+  version "8.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
+  integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
   dependencies:
-    is-docker "^2.0.0"
-    is-wsl "^2.1.1"
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
 
 optimism@^0.16.1:
   version "0.16.2"
@@ -7590,6 +7877,13 @@ p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -7604,6 +7898,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@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -7750,6 +8051,14 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+path@^0.12.7:
+  version "0.12.7"
+  resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
+  integrity sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==
+  dependencies:
+    process "^0.11.1"
+    util "^0.10.3"
+
 pbkdf2@^3.0.3, pbkdf2@^3.0.9, pbkdf2@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
@@ -7817,18 +8126,13 @@ 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:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
   dependencies:
     find-up "^3.0.0"
 
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
 postcss-attribute-case-insensitive@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz#39cbf6babf3ded1e4abf37d09d6eda21c644105c"
@@ -8359,12 +8663,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c"
-  integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==
-
-prettier@^2.7.0:
+prettier@^2.7.0, prettier@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
   integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
@@ -8397,7 +8696,12 @@ pretty-time@^1.1.0:
   resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e"
   integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==
 
-process@^0.11.10:
+process-nextick-args@~2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+
+process@^0.11.1, process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
@@ -8409,7 +8713,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prompts@2.4.0, prompts@^2.0.1:
+prompts@^2.0.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7"
   integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==
@@ -8417,6 +8721,14 @@ prompts@2.4.0, prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
+prompts@^2.4.2:
+  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@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
@@ -8532,35 +8844,35 @@ react-countdown@2.3.2:
   dependencies:
     prop-types "^15.7.2"
 
-react-dev-utils@11.0.4:
-  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.10.4"
-    address "1.1.2"
-    browserslist "4.14.2"
-    chalk "2.4.2"
-    cross-spawn "7.0.3"
-    detect-port-alt "1.1.6"
-    escape-string-regexp "2.0.0"
-    filesize "6.1.0"
-    find-up "4.1.0"
-    fork-ts-checker-webpack-plugin "4.1.6"
-    global-modules "2.0.0"
-    globby "11.0.1"
-    gzip-size "5.1.1"
-    immer "8.0.1"
-    is-root "2.1.0"
-    loader-utils "2.0.0"
-    open "^7.0.2"
-    pkg-up "3.1.0"
-    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"
-    text-table "0.2.0"
+react-dev-utils@^12:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
+  integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==
+  dependencies:
+    "@babel/code-frame" "^7.16.0"
+    address "^1.1.2"
+    browserslist "^4.18.1"
+    chalk "^4.1.2"
+    cross-spawn "^7.0.3"
+    detect-port-alt "^1.1.6"
+    escape-string-regexp "^4.0.0"
+    filesize "^8.0.6"
+    find-up "^5.0.0"
+    fork-ts-checker-webpack-plugin "^6.5.0"
+    global-modules "^2.0.0"
+    globby "^11.0.4"
+    gzip-size "^6.0.0"
+    immer "^9.0.7"
+    is-root "^2.1.0"
+    loader-utils "^3.2.0"
+    open "^8.4.0"
+    pkg-up "^3.1.0"
+    prompts "^2.4.2"
+    react-error-overlay "^6.0.11"
+    recursive-readdir "^2.2.2"
+    shell-quote "^1.7.3"
+    strip-ansi "^6.0.1"
+    text-table "^0.2.0"
 
 react-dom@18.2.0:
   version "18.2.0"
@@ -8570,10 +8882,10 @@ react-dom@18.2.0:
     loose-envify "^1.1.0"
     scheduler "^0.23.0"
 
-react-error-overlay@^6.0.9:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6"
-  integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==
+react-error-overlay@^6.0.11:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
+  integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
 react-hook-form@5.3.1:
   version "5.3.1"
@@ -8709,7 +9021,20 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-readable-stream@^3.5.0, readable-stream@^3.6.0:
+readable-stream@^2.0.0, readable-stream@^2.0.5:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -8718,6 +9043,13 @@ readable-stream@^3.5.0, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdir-glob@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.2.tgz#b185789b8e6a43491635b6953295c5c5e3fd224c"
+  integrity sha512-6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA==
+  dependencies:
+    minimatch "^5.1.0"
+
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -8725,19 +9057,19 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
   dependencies:
-    resolve "^1.9.0"
+    resolve "^1.20.0"
 
-recursive-readdir@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
-  integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==
+recursive-readdir@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
+  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
   dependencies:
-    minimatch "3.0.4"
+    minimatch "^3.0.5"
 
 reduce-css-calc@^2.1.8:
   version "2.1.8"
@@ -8796,7 +9128,7 @@ regenerator-transform@^0.15.0:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regex-not@^1.0.0, regex-not@^1.0.2:
+regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
@@ -8893,6 +9225,11 @@ require-from-string@^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==
 
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
 reselect@^4.1.5:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.6.tgz#19ca2d3d0b35373a74dc1c98692cdaffb6602656"
@@ -8925,7 +9262,7 @@ resolve.exports@^1.1.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -9020,7 +9357,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.1:
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -9060,6 +9397,15 @@ scheduler@^0.23.0:
   dependencies:
     loose-envify "^1.1.0"
 
+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@^2.6.5:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
@@ -9098,7 +9444,7 @@ seedrandom@^3.0.5:
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7"
   integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -9176,11 +9522,16 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@1.7.2, shell-quote@^1.6.1:
+shell-quote@^1.6.1:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
+shell-quote@^1.7.3:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.4.tgz#33fe15dee71ab2a81fcbd3a52106c5cfb9fb75d8"
+  integrity sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -9356,12 +9707,10 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-std-env@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/std-env/-/std-env-2.2.1.tgz#2ffa0fdc9e2263e0004c1211966e960948a40f6b"
-  integrity sha512-IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ==
-  dependencies:
-    ci-info "^1.6.0"
+std-env@^3.0.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.1.tgz#93a81835815e618c8aa75e7c8a4dc04f7c314e29"
+  integrity sha512-3H20QlwQsSm2OvAxWIYhs+j01MzzqwMwGiiO1NQaJYZgJZFPuAbf95/DiKRBSTYIJ2FeGUc+B/6mPGcWP9dO3Q==
 
 stream-browserify@3.0.0:
   version "3.0.0"
@@ -9440,12 +9789,12 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-strip-ansi@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
-    ansi-regex "^5.0.0"
+    safe-buffer "~5.1.0"
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
@@ -9569,6 +9918,14 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
+synckit@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.4.tgz#0e6b392b73fafdafcde56692e3352500261d64ec"
+  integrity sha512-Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw==
+  dependencies:
+    "@pkgr/utils" "^2.3.1"
+    tslib "^2.4.0"
+
 tailwindcss@2.2.19:
   version "2.2.19"
   resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.2.19.tgz#540e464832cd462bb9649c1484b0a38315c2653c"
@@ -9617,6 +9974,17 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
+tar-stream@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 terminal-link@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
@@ -9655,7 +10023,7 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-text-table@0.2.0, text-table@^0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
@@ -9677,6 +10045,14 @@ timers-browserify@^2.0.12:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-glob@^0.2.9:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
+  integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
+  dependencies:
+    globalyzer "0.1.0"
+    globrex "^0.1.2"
+
 tippy.js@6.2.6:
   version "6.2.6"
   resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.2.6.tgz#4991bbe8f75e741fb92b5ccfeebcd072d71f8345"
@@ -9730,7 +10106,7 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-to-regex@^3.0.1, to-regex@^3.0.2:
+to-regex@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
   integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
@@ -9841,7 +10217,7 @@ ts-prune@^0.10.3:
     "true-myth" "^4.1.0"
     ts-morph "^13.0.1"
 
-tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0:
+tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
   integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
@@ -9851,7 +10227,7 @@ tsconfig-paths@^3.14.1, tsconfig-paths@^3.9.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.4.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@~2.1.0:
+tslib@2.4.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@~2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
@@ -10060,7 +10436,7 @@ useragent@^2.3.0:
     lru-cache "4.1.x"
     tmp "0.0.x"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -10079,6 +10455,13 @@ util@0.11.1:
   dependencies:
     inherits "2.0.3"
 
+util@^0.10.3:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+  dependencies:
+    inherits "2.0.3"
+
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -10178,6 +10561,11 @@ webextension-polyfill@^0.8.0:
   resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.8.0.tgz#f80e9f4b7f81820c420abd6ffbebfa838c60e041"
   integrity sha512-a19+DzlT6Kp9/UI+mF9XQopeZ+n2ussjhxHJ4/pmIGge9ijCDz7Gn93mNnjpZAk95T4Tae8iHZ6sSf869txqiQ==
 
+webextension-polyfill@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.9.0.tgz#de6c1941d0ef1b0858b20e9c7b46bbc042c5a960"
+  integrity sha512-LTtHb0yR49xa9irkstDxba4GATDAcDw3ncnFH9RImoFwDlW47U95ME5sn5IiQX2ghfaECaf6xyXM8yvClIBkkw==
+
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
@@ -10193,24 +10581,43 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-cli@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
-  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
+webpack-cli@^5:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.0.tgz#bd380a9653e0cd1a08916c4ff1adea17201ef68f"
+  integrity sha512-AACDTo20yG+xn6HPW5xjbn2Be4KUzQPebWXsDMHwPPyKh9OnTOJgZN2Nc+g/FZKV3ObRTYsGvibAvc+5jAUrVA==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.2.0"
-    "@webpack-cli/info" "^1.5.0"
-    "@webpack-cli/serve" "^1.7.0"
+    "@webpack-cli/configtest" "^2.0.0"
+    "@webpack-cli/info" "^2.0.0"
+    "@webpack-cli/serve" "^2.0.0"
     colorette "^2.0.14"
-    commander "^7.0.0"
+    commander "^9.4.1"
     cross-spawn "^7.0.3"
+    envinfo "^7.7.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
-    interpret "^2.2.0"
-    rechoir "^0.7.0"
+    interpret "^3.1.1"
+    rechoir "^0.8.0"
     webpack-merge "^5.7.3"
 
+webpack-ext-reloader-mv3@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-ext-reloader-mv3/-/webpack-ext-reloader-mv3-2.1.1.tgz#a96c8be4ab64966c4ac5c556a394c6db29b3360a"
+  integrity sha512-hCdoQ9zr66zDhH1Aa+4XhFAZynMkH4E+Hy8rdLCRULyIdT7fwyXbfhAdReVFrA8qAs5Ct4vHhTGYRtk3/Lau9Q==
+  dependencies:
+    "@types/webextension-polyfill" "^0.8.3"
+    "@types/webpack" "^5.28.0"
+    "@types/webpack-sources" "^3.2.0"
+    clean-webpack-plugin "^4.0.0"
+    colors "^1.4.0"
+    cross-env "^7.0.3"
+    lodash "^4.17.21"
+    minimist "^1.2.6"
+    useragent "^2.3.0"
+    webextension-polyfill "^0.9.0"
+    webpack-sources "^3.2.3"
+    ws "^8.6.0"
+
 webpack-ext-reloader@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/webpack-ext-reloader/-/webpack-ext-reloader-1.1.9.tgz#7d4145c459ba3ec6e377b0e87065f7ea68686a73"
@@ -10242,10 +10649,15 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.74.0:
-  version "5.74.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
-  integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
+webpack-target-webextension@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/webpack-target-webextension/-/webpack-target-webextension-1.0.4.tgz#c0c97af2016dd7807c1ea37e8b5d6cae1aba138b"
+  integrity sha512-bxvB7a+R587DY4V39RsmcA04hcBDQAVwNvAITIA5m02wnjwSymF+H1CpHmheSa0HTh3mAp0KPAt4AWzzoUvTkw==
+
+webpack@^5:
+  version "5.75.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
+  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -10272,10 +10684,10 @@ webpack@5.74.0:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-webpack@^5:
-  version "5.75.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
-  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
+webpack@^5.74.0:
+  version "5.74.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
+  integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -10302,19 +10714,15 @@ webpack@^5:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-webpackbar@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-4.0.0.tgz#ee7a87f16077505b5720551af413c8ecd5b1f780"
-  integrity sha512-k1qRoSL/3BVuINzngj09nIwreD8wxV4grcuhHTD8VJgUbGcy8lQSPqv+bM00B7F+PffwIsQ8ISd4mIwRbr23eQ==
+webpackbar@^5:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570"
+  integrity sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==
   dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^2.4.2"
-    consola "^2.10.0"
-    figures "^3.0.0"
+    chalk "^4.1.0"
+    consola "^2.15.3"
     pretty-time "^1.1.0"
-    std-env "^2.2.1"
-    text-table "^0.2.0"
-    wrap-ansi "^6.0.0"
+    std-env "^3.0.1"
 
 whatwg-encoding@^1.0.5:
   version "1.0.5"
@@ -10380,22 +10788,6 @@ word-wrap@^1.2.3, word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-worker-rpc@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/worker-rpc/-/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5"
-  integrity sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==
-  dependencies:
-    microevent.ts "~0.1.1"
-
-wrap-ansi@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -10420,7 +10812,14 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@7.4.6, ws@^7.4.6, ws@^7.5.2, ws@^8.4.2:
+write@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@7.4.6, ws@^7.4.6, ws@^7.5.2, ws@^8.4.2, ws@^8.6.0:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
@@ -10470,7 +10869,7 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.10.2:
+yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
@@ -10493,18 +10892,16 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yazl@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
-  integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==
-  dependencies:
-    buffer-crc32 "~0.2.3"
-
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
 
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 zen-observable-ts@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58"
@@ -10517,9 +10914,18 @@ zen-observable@0.8.15:
   resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
   integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
 
-zip-webpack-plugin@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/zip-webpack-plugin/-/zip-webpack-plugin-4.0.1.tgz#95f09716ecf73e53d949443017cfb03afe597dd3"
-  integrity sha512-G041Q4qUaog44Ynit6gs4o+o3JIv0WWfOLvc8Q3IxvPfuqd2KBHhpJWAXUB9Cm1JcWHTIOp9vS3oGMWa1p1Ehw==
+zip-a-folder@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/zip-a-folder/-/zip-a-folder-1.1.5.tgz#9c3176e844bc1305338717fab765edac4839b778"
+  integrity sha512-w6I4mvWc6D0Q4pdzCSFbQih/ezYBdjwGZVbWRRFMOYcOdtE9TONZ7YtXCPnHj4XJQmXQxTOWcRGnPYxRn+d0mw==
   dependencies:
-    yazl "^2.5.1"
+    archiver "^5.3.1"
+
+zip-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79"
+  integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==
+  dependencies:
+    archiver-utils "^2.1.0"
+    compress-commons "^4.1.0"
+    readable-stream "^3.6.0"