From 20db12f9a540d14d9c46541e7e1e7337bf76a3b9 Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 22 Aug 2022 18:08:55 -0500
Subject: [PATCH 001/132] Chore/update 0.6.0 (#567)

* Fixed transactionId and object proptypes

* Auto fix with --fix

* Fixed remaining issues

* Updated controller to 0.19.8 and bumped plug version to 0.5.4

* Moved whitelist population to requestConnect

* Removed whitelist population

* Updated branch

Co-authored-by: rocky-fleek <tomas@fleek.co>
Co-authored-by: tomiir <rocchitomas@gmail.com>
---
 package.json                                  |   4 +-
 source/Background/utils.js                    |   3 +-
 source/Modules/Controller/connection.js       |   9 +-
 source/Modules/NotificationManager.js         |   2 +
 source/components/ActionCard/index.jsx        |   2 +-
 .../components/ActivityItemDetails/index.js   |   2 +-
 .../components/LiquidityIcon/styles.js        |   2 +-
 .../LiquidityItem/components/TokenAmounts.jsx |   2 +
 .../components/items/LiquidityItem/index.js   |   2 +-
 .../ActivityItem/components/items/NFTItem.js  |   2 +-
 .../ActivityItem/components/items/SwapItem.js |   2 +-
 source/components/Button/index.jsx            |   2 +-
 .../components/ConnectionControls/index.jsx   |  51 +-
 source/components/ContactItem/index.jsx       |   2 +-
 source/components/DisplayBox/index.jsx        |   2 +-
 source/components/GenericIcon/index.jsx       |   2 +-
 source/components/GroupedDisplay/index.jsx    |  65 ---
 source/components/GroupedDisplay/styles.js    |   0
 source/components/MenuItem/index.jsx          |   1 +
 source/components/MultiInput/index.jsx        |   6 +-
 source/components/NFTDisplayer/index.jsx      |   2 +-
 source/components/Select/index.jsx            |   2 +-
 source/redux/send.js                          |  10 +-
 source/shared/ProviderWrapper.js              |   4 +-
 source/shared/services/ICNS.js                |   3 +-
 source/shared/utils/contacts.js               |   1 +
 source/shared/utils/send.js                   |   2 +
 .../Extension/Views/Swap/Steps/Step1.jsx      |  10 +-
 .../Extension/Views/Swap/Steps/Step2.jsx      |   4 +-
 .../Popup/components/AllowAgent/index.jsx     |   7 +-
 .../views/Popup/components/BurnXTC/index.jsx  |   1 +
 .../Popup/components/LoginProxy/index.jsx     |   1 +
 .../components/BatchTransactions/index.jsx    |   1 +
 .../Details/components/DisplayBox.jsx         |   2 +-
 .../components/Transfer/components/Data.jsx   |   2 +-
 .../Transfer/components/Details.jsx           |   2 +-
 .../views/Popup/components/Transfer/index.jsx |   1 +
 yarn.lock                                     | 495 ++++++++----------
 38 files changed, 310 insertions(+), 403 deletions(-)
 delete mode 100644 source/components/GroupedDisplay/index.jsx
 delete mode 100644 source/components/GroupedDisplay/styles.js

diff --git a/package.json b/package.json
index 7f78de7a..a503508c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plug",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "Your plug into the Internet Computer",
   "private": true,
   "repository": "https://github.com/Psychedelic/plug",
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.7",
+    "@psychedelic/plug-controller": "0.19.8",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/Background/utils.js b/source/Background/utils.js
index 07d79953..02dc7754 100644
--- a/source/Background/utils.js
+++ b/source/Background/utils.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import PlugController from '@psychedelic/plug-controller';
 
 import { validateCanisterId, validatePrincipalId, validateAccountId } from '@shared/utils/ids';
@@ -183,7 +184,7 @@ export const handleCallRequest = async ({
     if (redirected) callback(null, true);
     return true;
   } catch (e) {
-    console.log('Error when executing update transaction', e);
+    console.warn('Error when executing update transaction', e);
     callback(ERRORS.SERVER_ERROR(e), null, [{ portId, callId }]);
     if (redirected) callback(null, false);
     return false;
diff --git a/source/Modules/Controller/connection.js b/source/Modules/Controller/connection.js
index 00860f7d..88366f89 100644
--- a/source/Modules/Controller/connection.js
+++ b/source/Modules/Controller/connection.js
@@ -131,6 +131,11 @@ export class ConnectionModule extends ControllerModuleBase {
 
         const date = new Date().toISOString();
 
+        const populatedWhitelist = canistersInfo.reduce(
+          (accum, canisterInfo) => ({ ...accum, [canisterInfo.id]: canisterInfo }),
+          {},
+        );
+
         getApps(this.keyring?.currentWalletId.toString(), (apps = {}) => {
           const newApps = {
             ...apps,
@@ -144,7 +149,7 @@ export class ConnectionModule extends ControllerModuleBase {
               events: [
                 ...apps[domainUrl]?.events || [],
               ],
-              whitelist,
+              whitelist: populatedWhitelist,
               host,
             },
           };
@@ -209,7 +214,7 @@ export class ConnectionModule extends ControllerModuleBase {
             ? CONNECTION_STATUS.accepted
             : response.status;
           const whitelist = response.status === CONNECTION_STATUS.accepted
-            ? response.whitelist
+            ? apps[url]?.whitelist
             : [];
 
           const date = new Date().toISOString();
diff --git a/source/Modules/NotificationManager.js b/source/Modules/NotificationManager.js
index 59ca9161..3b389e15 100644
--- a/source/Modules/NotificationManager.js
+++ b/source/Modules/NotificationManager.js
@@ -34,3 +34,5 @@ export class NotificationManager {
     });
   }
 }
+
+export default NotificationManager;
diff --git a/source/components/ActionCard/index.jsx b/source/components/ActionCard/index.jsx
index 7bde2f7b..bd94a24c 100644
--- a/source/components/ActionCard/index.jsx
+++ b/source/components/ActionCard/index.jsx
@@ -32,5 +32,5 @@ ActionCard.propTypes = {
   button: PropTypes.string.isRequired,
   onClick: PropTypes.func.isRequired,
   // eslint-disable-next-line react/forbid-prop-types
-  buttonProps: PropTypes.object,
+  buttonProps: PropTypes.objectOf(PropTypes.string),
 };
diff --git a/source/components/ActivityItem/components/ActivityItemDetails/index.js b/source/components/ActivityItem/components/ActivityItemDetails/index.js
index cf8e464e..30a55913 100644
--- a/source/components/ActivityItem/components/ActivityItemDetails/index.js
+++ b/source/components/ActivityItem/components/ActivityItemDetails/index.js
@@ -47,7 +47,7 @@ ActivityItemDetails.propTypes = {
   secondary: PropTypes.string.isRequired,
   isTransaction: PropTypes.bool.isRequired,
   hovering: PropTypes.bool.isRequired,
-  details: PropTypes.objectOf(PropTypes.any).isRequired,
+  details: PropTypes.objectOf(PropTypes.string).isRequired,
   setOpenDetail: PropTypes.func.isRequired,
 };
 
diff --git a/source/components/ActivityItem/components/items/LiquidityItem/components/LiquidityIcon/styles.js b/source/components/ActivityItem/components/items/LiquidityItem/components/LiquidityIcon/styles.js
index d0d37f6a..d98dce97 100644
--- a/source/components/ActivityItem/components/items/LiquidityItem/components/LiquidityIcon/styles.js
+++ b/source/components/ActivityItem/components/items/LiquidityItem/components/LiquidityIcon/styles.js
@@ -1,5 +1,5 @@
 import { makeStyles } from '@material-ui/core/styles';
-import { SHADOW_1 } from '@shared/styles/shadows';
+import SHADOW_1 from '@shared/styles/shadows';
 
 export default makeStyles((theme) => ({
   root: {
diff --git a/source/components/ActivityItem/components/items/LiquidityItem/components/TokenAmounts.jsx b/source/components/ActivityItem/components/items/LiquidityItem/components/TokenAmounts.jsx
index 13f330aa..f2401f67 100644
--- a/source/components/ActivityItem/components/items/LiquidityItem/components/TokenAmounts.jsx
+++ b/source/components/ActivityItem/components/items/LiquidityItem/components/TokenAmounts.jsx
@@ -19,6 +19,7 @@ const TokenAmounts = ({ token0, token1 }) => {
         value={amount0}
         displayType="text"
         thousandSeparator=","
+        // eslint-disable-next-line react/prop-types
         suffix={` ${token0?.token?.details?.symbol}`}
         decimalScale={3}
       />
@@ -27,6 +28,7 @@ const TokenAmounts = ({ token0, token1 }) => {
         value={amount1}
         displayType="text"
         thousandSeparator=","
+        // eslint-disable-next-line react/prop-types
         suffix={` ${token1?.token?.details?.symbol}`}
         decimalScale={3}
       />
diff --git a/source/components/ActivityItem/components/items/LiquidityItem/index.js b/source/components/ActivityItem/components/items/LiquidityItem/index.js
index b3175eee..b8d2805f 100644
--- a/source/components/ActivityItem/components/items/LiquidityItem/index.js
+++ b/source/components/ActivityItem/components/items/LiquidityItem/index.js
@@ -62,7 +62,7 @@ LiquidityItem.defaultProps = {
 
 LiquidityItem.propTypes = {
   type: PropTypes.number,
-  details: PropTypes.objectOf(PropTypes.any),
+  details: PropTypes.objectOf(PropTypes.string),
   date: PropTypes.oneOfType([
     PropTypes.instanceOf(Date),
     PropTypes.string,
diff --git a/source/components/ActivityItem/components/items/NFTItem.js b/source/components/ActivityItem/components/items/NFTItem.js
index 15667634..fbaf9846 100644
--- a/source/components/ActivityItem/components/items/NFTItem.js
+++ b/source/components/ActivityItem/components/items/NFTItem.js
@@ -71,7 +71,7 @@ NFTItem.defaultProps = {
 NFTItem.propTypes = {
   type: PropTypes.number,
   canisterId: PropTypes.string,
-  details: PropTypes.objectOf(PropTypes.any),
+  details: PropTypes.objectOf(PropTypes.string),
   to: PropTypes.string,
   from: PropTypes.string,
   logo: PropTypes.string.isRequired,
diff --git a/source/components/ActivityItem/components/items/SwapItem.js b/source/components/ActivityItem/components/items/SwapItem.js
index 013189c9..fae1c498 100644
--- a/source/components/ActivityItem/components/items/SwapItem.js
+++ b/source/components/ActivityItem/components/items/SwapItem.js
@@ -76,7 +76,7 @@ SwapItem.defaultProps = {
 };
 
 SwapItem.propTypes = {
-  details: PropTypes.objectOf(PropTypes.any),
+  details: PropTypes.objectOf(PropTypes.string), // eslint-disable-line react/forbid-prop-types
   date: PropTypes.oneOfType([
     PropTypes.instanceOf(Date),
     PropTypes.string,
diff --git a/source/components/Button/index.jsx b/source/components/Button/index.jsx
index d4cc437d..2667aaa4 100644
--- a/source/components/Button/index.jsx
+++ b/source/components/Button/index.jsx
@@ -72,6 +72,6 @@ Button.propTypes = {
   loading: PropTypes.bool,
   disabled: PropTypes.bool,
   fullWidth: PropTypes.bool,
-  wrapperStyle: PropTypes.object,
+  wrapperStyle: PropTypes.objectOf(PropTypes.string),
   buttonTestId: PropTypes.string,
 };
diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index e97c9a25..41c2418b 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -1,13 +1,13 @@
-import React, { useEffect, useMemo, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { capitalize } from "@material-ui/core";
-import { getTabURL } from "@shared/utils/chrome-tabs";
-import extensionizer from "extensionizer";
-import PropTypes from "prop-types";
-import clsx from "clsx";
-
-import { useContacts } from "@hooks";
-import { useICPPrice } from "@redux/icp";
+import React, { useEffect, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { capitalize } from '@material-ui/core';
+import { getTabURL } from '@shared/utils/chrome-tabs';
+import extensionizer from 'extensionizer';
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+
+import { useContacts } from '@hooks';
+import { useICPPrice } from '@redux/icp';
 import {
   setAssets,
   setAssetsLoading,
@@ -15,16 +15,15 @@ import {
   setTransactionsLoading,
   setCollections,
   setCollectionsLoading,
-} from "@redux/wallet";
-import { getApps } from "@modules/storageManager";
-import { getCurrentNetwork, getNetworks } from "@redux/network";
-import { HANDLER_TYPES, sendMessage } from "@background/Keyring";
-import { TABS, useRouter } from "@components/Router";
-import RefreshAsset from "@assets/icons/refresh.svg";
+} from '@redux/wallet';
+import { getApps } from '@modules/storageManager';
+import { getCurrentNetwork, getNetworks } from '@redux/network';
+import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
+import { TABS, useRouter } from '@components/Router';
+import RefreshAsset from '@assets/icons/refresh.svg';
 
-import useStyles from "./styles";
-import NetworkSelector from "../NetworkSelector";
-import { setICPPrice, setICPPriceLoading } from "../../../../redux/icp";
+import useStyles from './styles';
+import NetworkSelector from '../NetworkSelector';
 
 const ConnectionControls = ({ disableNavigation, hidden }) => {
   const classes = useStyles();
@@ -78,7 +77,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
       (keyringAssets) => {
         dispatch(setAssets({ keyringAssets, icpPrice }));
         dispatch(setAssetsLoading(false));
-      }
+      },
     );
   };
 
@@ -92,7 +91,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
       (trxs) => {
         dispatch(setTransactions({ ...trxs, icpPrice, useICNS }));
         dispatch(setTransactionsLoading(false));
-      }
+      },
     );
   };
 
@@ -106,11 +105,11 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
       (nftCollections) => {
         if (nftCollections?.length) {
           dispatch(
-            setCollections({ collections: nftCollections, principalId })
+            setCollections({ collections: nftCollections, principalId }),
           );
         }
         dispatch(setCollectionsLoading(false));
-      }
+      },
     );
   };
 
@@ -142,12 +141,12 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
           <div
             className={clsx(
               classes.controlsInfo,
-              connected && classes.connectedControls
+              connected && classes.connectedControls,
             )}
           >
             <div className={clsx(classes.statusDot)} />
             <span className={classes.network}>
-              {capitalize(currentNetwork?.name || "Mainnet")}
+              {capitalize(currentNetwork?.name || 'Mainnet')}
             </span>
           </div>
         </div>
@@ -163,7 +162,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
             alt="reload"
             className={clsx(
               classes.reloadIcon,
-              isTabInfoLoading && classes.reloadIconLoading
+              isTabInfoLoading && classes.reloadIconLoading,
             )}
           />
         </button>
diff --git a/source/components/ContactItem/index.jsx b/source/components/ContactItem/index.jsx
index d705a69d..1c5f5038 100644
--- a/source/components/ContactItem/index.jsx
+++ b/source/components/ContactItem/index.jsx
@@ -50,7 +50,7 @@ const ContactItem = ({
 };
 
 ContactItem.propTypes = {
-  contact: PropTypes.object.isRequired,
+  contact: PropTypes.objectOf(PropTypes.string).isRequired,
   handleClick: PropTypes.func,
   handleDelete: PropTypes.func,
   handleCancel: PropTypes.func,
diff --git a/source/components/DisplayBox/index.jsx b/source/components/DisplayBox/index.jsx
index eb958c64..2e40ca6c 100644
--- a/source/components/DisplayBox/index.jsx
+++ b/source/components/DisplayBox/index.jsx
@@ -30,7 +30,7 @@ const DisplayBox = ({
 DisplayBox.propTypes = {
   title: PropTypes.string.isRequired,
   subtitle: PropTypes.string.isRequired,
-  img: PropTypes.string | PropTypes.node,
+  img: PropTypes.string || PropTypes.node,
 };
 
 DisplayBox.defaultProps = {
diff --git a/source/components/GenericIcon/index.jsx b/source/components/GenericIcon/index.jsx
index 24bf43ec..168cd99d 100644
--- a/source/components/GenericIcon/index.jsx
+++ b/source/components/GenericIcon/index.jsx
@@ -40,5 +40,5 @@ GenericIcon.defaultProps = {
 GenericIcon.propTypes = {
   image: PropTypes.string.isRequired,
   type: PropTypes.string,
-  style: PropTypes.object,
+  style: PropTypes.objectOf(PropTypes.string),
 };
diff --git a/source/components/GroupedDisplay/index.jsx b/source/components/GroupedDisplay/index.jsx
deleted file mode 100644
index 3883ba8f..00000000
--- a/source/components/GroupedDisplay/index.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { Typography } from '@material-ui/core';
-import { useTranslation } from 'react-i18next';
-import ActionDialog from '../ActionDialog';
-import ContactItem from '../ContactItem';
-import useStyles from './styles';
-
-const GroupedDisplay = ({ data, ItemComponent, itemProps }) => {
-  const { t } = useTranslation();
-
-  const [open, setOpen] = useState(false);
-  const classes = useStyles();
-
-  return (
-    <div className={classes.contactContainer}>
-      {
-        [...data].sort((a, b) => a.letter.localeCompare(b.letter)).map((group) => (
-          <>
-            <div className={classes.divider}>
-              {group.letter}
-            </div>
-            {
-              [...item.contacts].sort((a, b) => a.name.localeCompare(b.name)).map((item) => (
-                <ItemComponent {...item} {...itemProps} />
-              ))
-            }
-          </>
-        ))
-      }
-      <div className={classes.line} />
-      {
-        open
-        && (
-          <ActionDialog
-            open={open}
-            title={t('contacts.deleteTitle')}
-            content={<Typography>{t('contacts.deleteText')} <b>{selectedContact.name}</b>?</Typography>}
-            confirmText={t('contacts.deleteButton')}
-            buttonVariant="danger"
-            onClick={() => { handleRemoveContact(selectedContact); setOpen(false); }}
-            onClose={() => setOpen(false)}
-            submitButtonProps={{
-              'data-testid': 'confirm-deleting-button',
-            }}
-          />
-        )
-      }
-    </div>
-  );
-};
-
-export default GroupedDisplay;
-
-GroupedDisplay.propTypes = {
-  data: PropTypes.arrayOf(PropTypes.objectOf(PropTypes.string)).isRequired,
-  handleRemoveContact: PropTypes.func.isRequired,
-  onClick: PropTypes.func,
-  selectable: PropTypes.bool,
-};
-
-GroupedDisplay.defaultProps = {
-  onClick: null,
-  selectable: false,
-};
diff --git a/source/components/GroupedDisplay/styles.js b/source/components/GroupedDisplay/styles.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/source/components/MenuItem/index.jsx b/source/components/MenuItem/index.jsx
index bddb57fc..e1c0aaa5 100644
--- a/source/components/MenuItem/index.jsx
+++ b/source/components/MenuItem/index.jsx
@@ -109,4 +109,5 @@ MenuItem.propTypes = {
   symbol: PropTypes.string,
   accountNameTestId: PropTypes.string,
   itemNameTestId: PropTypes.string,
+  image: PropTypes.string.isRequired,
 };
diff --git a/source/components/MultiInput/index.jsx b/source/components/MultiInput/index.jsx
index 5add2278..a4d8cff7 100644
--- a/source/components/MultiInput/index.jsx
+++ b/source/components/MultiInput/index.jsx
@@ -128,8 +128,8 @@ MultiInput.propTypes = {
   onClick: PropTypes.func.isRequired,
   value: PropTypes.number.isRequired,
   onChange: PropTypes.func.isRequired,
-  primaryValue: PropTypes.object.isRequired,
-  secondaryValue: PropTypes.object.isRequired,
+  primaryValue: PropTypes.objectOf(PropTypes.string).isRequired,
+  secondaryValue: PropTypes.objectOf(PropTypes.string).isRequired,
   conversionPrice: PropTypes.number.isRequired,
   handleSwapValues: PropTypes.func.isRequired,
   availableAmount: PropTypes.number.isRequired,
@@ -140,7 +140,7 @@ MultiInput.propTypes = {
 };
 
 NumberFormatCustom.propTypes = {
-  inputRef: PropTypes.object.isRequired,
+  inputRef: PropTypes.objectOf(PropTypes.string).isRequired,
   onChange: PropTypes.func.isRequired,
   prefix: PropTypes.string.isRequired,
   suffix: PropTypes.string.isRequired,
diff --git a/source/components/NFTDisplayer/index.jsx b/source/components/NFTDisplayer/index.jsx
index de74a0b1..6043ffbe 100644
--- a/source/components/NFTDisplayer/index.jsx
+++ b/source/components/NFTDisplayer/index.jsx
@@ -30,7 +30,7 @@ const TAG_PROPS = {
 };
 
 const NFTDisplayer = ({
-  url, className, onClick, interactive, defaultTag, nftTestId,
+  url, className, onClick, interactive, defaultTag,
 }) => {
   const classes = useStyles();
   const [loading, setLoading] = useState(true);
diff --git a/source/components/Select/index.jsx b/source/components/Select/index.jsx
index a3ab171d..cc35f29a 100644
--- a/source/components/Select/index.jsx
+++ b/source/components/Select/index.jsx
@@ -83,7 +83,7 @@ Select.propTypes = {
   icon: PropTypes.node,
   readonly: PropTypes.bool,
   imageClassName: PropTypes.string,
-  nft: PropTypes.oneOf([PropTypes.bool, PropTypes.object]),
+  nft: PropTypes.oneOf([PropTypes.bool, PropTypes.objectOf(PropTypes.string)]),
   className: PropTypes.string,
   accountNameTestId: PropTypes.string,
 };
diff --git a/source/redux/send.js b/source/redux/send.js
index 906d4f6c..750195ed 100644
--- a/source/redux/send.js
+++ b/source/redux/send.js
@@ -53,13 +53,13 @@ const ERRORS_INFO = [
 const matchErrors = (err) => {
   for (const errorInfo of ERRORS_INFO) {
     const currentError = errorInfo?.errorNames?.some(
-      (errorKeyword) => err.includes(errorKeyword)
+      (errorKeyword) => err.includes(errorKeyword),
     );
 
     if (currentError) {
       return errorInfo?.errorCode;
     }
-  };
+  }
 
   return 600;
 };
@@ -81,7 +81,9 @@ export const sendToken = createAsyncThunk(
     const { canisterId, standard, decimals } = selectedAsset || {};
 
     try {
-      const res = await callSendToken({ to, amount, canisterId, standard, decimals });
+      const res = await callSendToken({
+        to, amount, canisterId, standard, decimals,
+      });
       return res;
     } catch ({ error }) {
       return rejectWithValue(error);
@@ -91,7 +93,7 @@ export const sendToken = createAsyncThunk(
 
 export const burnXTC = createAsyncThunk(
   'sendToken/burnXTC',
-  async (arg, { getState }) => {
+  async (arg, { getState, rejectWithValue }) => {
     const { send: state } = getState();
     const { addressInfo, address, amount: rawAmount } = state;
 
diff --git a/source/shared/ProviderWrapper.js b/source/shared/ProviderWrapper.js
index 05703b35..973effd3 100644
--- a/source/shared/ProviderWrapper.js
+++ b/source/shared/ProviderWrapper.js
@@ -19,9 +19,9 @@ ProviderWrapper.propTypes = {
     PropTypes.node,
   ]).isRequired,
   // eslint-disable-next-line react/forbid-prop-types
-  store: PropTypes.object.isRequired,
+  store: PropTypes.objectOf(PropTypes.string).isRequired,
   // eslint-disable-next-line react/forbid-prop-types
-  theme: PropTypes.object.isRequired,
+  theme: PropTypes.objectOf(PropTypes.string).isRequired,
 };
 
 export default ProviderWrapper;
diff --git a/source/shared/services/ICNS.js b/source/shared/services/ICNS.js
index 9182ef34..722e949b 100644
--- a/source/shared/services/ICNS.js
+++ b/source/shared/services/ICNS.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import { Actor, HttpAgent } from '@dfinity/agent';
 import crossFetch from 'cross-fetch';
 
@@ -57,7 +58,7 @@ export const resolveName = async (name, isICP) => {
     }
     return Array.isArray(principal) ? principal?.[0]?.toString() : principal?.toString?.();
   } catch (e) {
-    console.log('Error resolving the ICNS', e);
+    console.warn('Error resolving the ICNS', e);
     return null;
   }
 };
diff --git a/source/shared/utils/contacts.js b/source/shared/utils/contacts.js
index 23c71353..2412d003 100644
--- a/source/shared/utils/contacts.js
+++ b/source/shared/utils/contacts.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-underscore-dangle */
 import { Principal } from '@dfinity/principal';
 import { getContacts, setContacts } from '@modules/storageManager';
 import { addContact } from '@background/Keyring';
diff --git a/source/shared/utils/send.js b/source/shared/utils/send.js
index 38f7d161..1308ed42 100644
--- a/source/shared/utils/send.js
+++ b/source/shared/utils/send.js
@@ -1,3 +1,5 @@
 export const truncateFloatForDisplay = (value, maxDecimals, displayDecimals) => Number(
   value.toFixed(maxDecimals).slice(0, -(maxDecimals - displayDecimals)),
 );
+
+export default { truncateFloatForDisplay };
diff --git a/source/views/Extension/Views/Swap/Steps/Step1.jsx b/source/views/Extension/Views/Swap/Steps/Step1.jsx
index 548d4e1b..84da7267 100644
--- a/source/views/Extension/Views/Swap/Steps/Step1.jsx
+++ b/source/views/Extension/Views/Swap/Steps/Step1.jsx
@@ -141,11 +141,11 @@ Step1.propTypes = {
   amount: PropTypes.number.isRequired,
   handleChangeAmount: PropTypes.func.isRequired,
   handleChangeStep: PropTypes.func.isRequired,
-  selectedFromAsset: PropTypes.object.isRequired,
-  selectedToAsset: PropTypes.object.isRequired,
-  availableAmount: PropTypes.object.isRequired,
-  primaryValue: PropTypes.object.isRequired,
-  secondaryValue: PropTypes.object.isRequired,
+  selectedFromAsset: PropTypes.objectOf(PropTypes.string).isRequired,
+  selectedToAsset: PropTypes.objectOf(PropTypes.string).isRequired,
+  availableAmount: PropTypes.objectOf(PropTypes.string).isRequired,
+  primaryValue: PropTypes.objectOf(PropTypes.string).isRequired,
+  secondaryValue: PropTypes.objectOf(PropTypes.string).isRequired,
   conversionPrice: PropTypes.number.isRequired,
   handleSwapValues: PropTypes.func.isRequired,
 };
diff --git a/source/views/Extension/Views/Swap/Steps/Step2.jsx b/source/views/Extension/Views/Swap/Steps/Step2.jsx
index 6c112651..b9447827 100644
--- a/source/views/Extension/Views/Swap/Steps/Step2.jsx
+++ b/source/views/Extension/Views/Swap/Steps/Step2.jsx
@@ -56,7 +56,7 @@ const Step2 = ({
 export default Step2;
 
 Step2.propTypes = {
-  fromAsset: PropTypes.object.isRequired,
+  fromAsset: PropTypes.objectOf(PropTypes.string).isRequired,
   fromAmount: PropTypes.number.isRequired,
-  toAsset: PropTypes.object.isRequired,
+  toAsset: PropTypes.objectOf(PropTypes.string).isRequired,
 };
diff --git a/source/views/Popup/components/AllowAgent/index.jsx b/source/views/Popup/components/AllowAgent/index.jsx
index 7e3da609..708e1483 100644
--- a/source/views/Popup/components/AllowAgent/index.jsx
+++ b/source/views/Popup/components/AllowAgent/index.jsx
@@ -58,14 +58,10 @@ const AllowAgent = ({
   const [expand, setExpand] = useState(false);
 
   const handleAllowAgent = async (status) => {
-    const whitelist = canisters.reduce(
-      (accum, canisterInfo) => ({ ...accum, [canisterInfo.id]: canisterInfo }),
-      {},
-    );
     reviewPendingTransaction(transactionId, () => {});
     const success = await portRPC.call('handleAllowAgent', [
       url,
-      { status, whitelist },
+      { status },
       callId,
       portId,
       transactionId,
@@ -211,4 +207,5 @@ AllowAgent.propTypes = {
   portId: PropTypes.string.isRequired,
   metadata: PropTypes.objectOf(PropTypes.string).isRequired,
   setOnTimeout: PropTypes.func.isRequired,
+  transactionId: PropTypes.string.isRequired,
 };
diff --git a/source/views/Popup/components/BurnXTC/index.jsx b/source/views/Popup/components/BurnXTC/index.jsx
index d4849837..b40f9489 100644
--- a/source/views/Popup/components/BurnXTC/index.jsx
+++ b/source/views/Popup/components/BurnXTC/index.jsx
@@ -128,4 +128,5 @@ BurnXTC.propTypes = {
   portId: PropTypes.string.isRequired,
   metadata: PropTypes.arrayOf(PropTypes.string).isRequired,
   setOnTimeout: PropTypes.func.isRequired,
+  transactionId: PropTypes.string.isRequired,
 };
diff --git a/source/views/Popup/components/LoginProxy/index.jsx b/source/views/Popup/components/LoginProxy/index.jsx
index 57f76d8b..82edb3ae 100644
--- a/source/views/Popup/components/LoginProxy/index.jsx
+++ b/source/views/Popup/components/LoginProxy/index.jsx
@@ -30,6 +30,7 @@ LoginProxy.propTypes = {
   callId: PropTypes.string.isRequired,
   portId: PropTypes.string.isRequired,
   metadata: PropTypes.objectOf(PropTypes.string).isRequired,
+  transactionId: PropTypes.string.isRequired,
 };
 
 export default LoginProxy;
diff --git a/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx b/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
index 24ec9147..e457fa89 100644
--- a/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
+++ b/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
@@ -130,4 +130,5 @@ BatchTransactions.propTypes = {
   portId: PropTypes.string.isRequired,
   metadata: PropTypes.arrayOf(PropTypes.string).isRequired,
   setOnTimeout: PropTypes.func.isRequired,
+  transactionId: PropTypes.string.isRequired,
 };
diff --git a/source/views/Popup/components/Sign/components/Details/components/DisplayBox.jsx b/source/views/Popup/components/Sign/components/Details/components/DisplayBox.jsx
index 112337fd..eef379d3 100644
--- a/source/views/Popup/components/Sign/components/Details/components/DisplayBox.jsx
+++ b/source/views/Popup/components/Sign/components/Details/components/DisplayBox.jsx
@@ -43,7 +43,7 @@ DisplayBox.propTypes = {
   title: PropTypes.string.isRequired,
   subtitle: PropTypes.string.isRequired,
   shouldWarn: PropTypes.bool.isRequired,
-  img: PropTypes.string | PropTypes.node,
+  img: PropTypes.string || PropTypes.node,
   request: PropTypes.shape({
     canisterDescription: PropTypes.string,
     canisterIcon: PropTypes.string,
diff --git a/source/views/Popup/components/Transfer/components/Data.jsx b/source/views/Popup/components/Transfer/components/Data.jsx
index 0fa166ea..6803d9cf 100644
--- a/source/views/Popup/components/Transfer/components/Data.jsx
+++ b/source/views/Popup/components/Transfer/components/Data.jsx
@@ -43,5 +43,5 @@ Data.propTypes = {
       component: PropTypes.node.isRequired,
     }),
   ).isRequired,
-  principalId: PropTypes.object.isRequired,
+  principalId: PropTypes.objectOf(PropTypes.string).isRequired,
 };
diff --git a/source/views/Popup/components/Transfer/components/Details.jsx b/source/views/Popup/components/Transfer/components/Details.jsx
index 31910b9a..b5e46e16 100644
--- a/source/views/Popup/components/Transfer/components/Details.jsx
+++ b/source/views/Popup/components/Transfer/components/Details.jsx
@@ -60,7 +60,7 @@ Details.defaultProps = {
 };
 
 Details.propTypes = {
-  token: PropTypes.object,
+  token: PropTypes.objectOf(PropTypes.string),
   amount: PropTypes.number.isRequired,
   image: PropTypes.string.isRequired,
   url: PropTypes.string.isRequired,
diff --git a/source/views/Popup/components/Transfer/index.jsx b/source/views/Popup/components/Transfer/index.jsx
index 56aaab3c..bb826ccc 100644
--- a/source/views/Popup/components/Transfer/index.jsx
+++ b/source/views/Popup/components/Transfer/index.jsx
@@ -143,4 +143,5 @@ Transfer.propTypes = {
   portId: PropTypes.string.isRequired,
   metadata: PropTypes.arrayOf(PropTypes.string).isRequired,
   setOnTimeout: PropTypes.func.isRequired,
+  transactionId: PropTypes.string.isRequired,
 };
diff --git a/yarn.lock b/yarn.lock
index 13fd61d9..58f75d40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1589,7 +1589,7 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@^5.0.0", "@npmcli/arborist@^5.0.4":
+"@npmcli/arborist@*", "@npmcli/arborist@^5.0.0":
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.0.tgz#ace635279d0d548df164ac83464237fd5f0175ad"
   integrity sha512-gM2AxWCaXTZRZnKOHT6uIUHTkvRf+UPU2iC/3nC1Bj21zemnoKyJh2NvcG69UCcfs+r1jpx6hZ0dL9s2yPssJQ==
@@ -1631,12 +1631,12 @@
     treeverse "^2.0.0"
     walk-up-path "^1.0.0"
 
-"@npmcli/ci-detect@^2.0.0":
+"@npmcli/ci-detect@*", "@npmcli/ci-detect@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
   integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
 
-"@npmcli/config@^4.1.0":
+"@npmcli/config@*":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.2.1.tgz#7a4b46f4a315fe369a3f8543c67fae0b89549a40"
   integrity sha512-iJEnXNAGGr7sGUcoKmeJNrc943vFiWrDWq6DNK/t+SuqoObmozMb3tN3G5T9yo3uBf5Cw4h+SWgoqSaiwczl0Q==
@@ -1696,7 +1696,7 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
+"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
   integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg==
@@ -1742,7 +1742,7 @@
   resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
   integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
 
-"@npmcli/package-json@^2.0.0":
+"@npmcli/package-json@*", "@npmcli/package-json@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
   integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
@@ -1765,17 +1765,7 @@
     postcss-selector-parser "^6.0.10"
     semver "^7.3.7"
 
-"@npmcli/run-script@^3.0.1":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-3.0.3.tgz#66afa6e0c4c3484056195f295fa6c1d1a45ddf58"
-  integrity sha512-ZXL6qgC5NjwfZJ2nET+ZSLEz/PJgJ/5CU90C2S66dZY4Jw73DasS4ZCXuy/KHWYP0imjJ4VtA+Gebb5BxxKp9Q==
-  dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^8.4.1"
-    read-package-json-fast "^2.0.3"
-
-"@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
+"@npmcli/run-script@*", "@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946"
   integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==
@@ -1834,10 +1824,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.19.7":
-  version "0.19.7"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.7/5c35f85f934acc1e243ec81ef5e1cd7a2b261680#5c35f85f934acc1e243ec81ef5e1cd7a2b261680"
-  integrity sha512-Hl8CjJwCY9nzntP7S75btzhMXsynS0IE1LqswiE905AACCY5vkA9ZfWW8tq4O3TM20PXJGeNSokJf0BBzXSzdg==
+"@psychedelic/plug-controller@0.19.8":
+  version "0.19.8"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.8/0d6ca60ad6449c0d20aa193e5d29dac578d2b941#0d6ca60ad6449c0d20aa193e5d29dac578d2b941"
+  integrity sha512-9Qe+p9m6Ju/Me73XrVYjlDbooRffW4O6fPTl3PIhWvApU22i9bdj7hak/1cC7e9qh5fwah4nk7r5k/avRgS71w==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -2447,7 +2437,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1, abbrev@^1.0.0, abbrev@~1.1.1:
+abbrev@*, abbrev@1, abbrev@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2505,7 +2495,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -2603,6 +2593,16 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
   integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
 
+ansicolors@*:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
+
+ansistyles@*:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
+  integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -2658,7 +2658,7 @@ archiver@^5.3.0:
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
-archy@~1.0.0:
+archy@*:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
@@ -3977,6 +3977,30 @@ builtins@^5.0.0:
   dependencies:
     semver "^7.0.0"
 
+cacache@*, cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
+  version "16.1.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.2.tgz#a519519e9fc9e5e904575dcd3b77660cbf03f749"
+  integrity sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^1.1.1"
+
 cacache@^12.0.2:
   version "12.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
@@ -3998,7 +4022,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.5, cacache@^15.2.0:
+cacache@^15.0.5:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -4022,30 +4046,6 @@ cacache@^15.0.5, cacache@^15.2.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
-  version "16.1.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.2.tgz#a519519e9fc9e5e904575dcd3b77660cbf03f749"
-  integrity sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^1.1.1"
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -4138,6 +4138,11 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
+chalk@*:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
+  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
+
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -4213,16 +4218,16 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chownr@*, chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 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==
 
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -4288,7 +4293,7 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-columns@^4.0.0:
+cli-columns@*:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
   integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
@@ -4303,7 +4308,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@^0.6.2:
+cli-table3@*:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
   integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
@@ -4474,7 +4479,7 @@ colors@1.4.0, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@^1.6.0:
+columnify@*:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
   integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
@@ -5461,7 +5466,7 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-encoding@^0.1.12, encoding@^0.1.13:
+encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -6049,6 +6054,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fastest-levenshtein@*:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
 fastest-levenshtein@^1.0.12:
   version "1.0.14"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz#9054384e4b7a78c88d01a4432dc18871af0ac859"
@@ -6477,28 +6487,28 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+glob@*, glob@^8.0.1:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.1.1"
+    minimatch "^5.0.1"
     once "^1.3.0"
-    path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+  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 "^5.0.1"
+    minimatch "^3.1.1"
     once "^1.3.0"
+    path-is-absolute "^1.0.0"
 
 global-modules@^0.2.3:
   version "0.2.3"
@@ -6572,7 +6582,7 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -6732,7 +6742,7 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^5.0.0:
+hosted-git-info@*, hosted-git-info@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
   integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
@@ -7001,6 +7011,11 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
+ini@*:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
+  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
+
 ini@^1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -7011,7 +7026,7 @@ ini@^3.0.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1"
   integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==
 
-init-package-json@^3.0.2:
+init-package-json@*:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
   integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
@@ -7130,7 +7145,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@^4.0.2:
+is-cidr@*:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
   integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
@@ -8084,7 +8099,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   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==
@@ -8339,7 +8354,7 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@^6.0.2:
+libnpmaccess@*:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded"
   integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg==
@@ -8349,7 +8364,7 @@ libnpmaccess@^6.0.2:
     npm-package-arg "^9.0.1"
     npm-registry-fetch "^13.0.0"
 
-libnpmdiff@^4.0.2:
+libnpmdiff@*:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.4.tgz#487ccb609dacd7f558f089feef3153933e157d02"
   integrity sha512-bUz12309DdkeFL/K0sKhW1mbg8DARMbNI0vQKrJp1J8lxhxqkAjzSQ3eQCacFjSwCz4xaf630ogwuOkSt61ZEQ==
@@ -8363,7 +8378,7 @@ libnpmdiff@^4.0.2:
     pacote "^13.6.1"
     tar "^6.1.0"
 
-libnpmexec@^4.0.2:
+libnpmexec@*:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.11.tgz#3307fd7b683630268237936a921f5faadd5bfaef"
   integrity sha512-uhkAWVT0pA1kVgqgTjIMVebOPl3PpIvVcRQ1IBV47ppVxmQr+JCjDahrV0K/0JUsKSVFozyGEEmg1Kz0HwRwzw==
@@ -8383,14 +8398,14 @@ libnpmexec@^4.0.2:
     semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@^3.0.1:
+libnpmfund@*:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.2.tgz#7da0827950f0db2cce0acb0dc7652d1834a8b239"
   integrity sha512-wmFMP/93Wjy+jDg5LaSldDgAhSgCyA64JUUmp806Kae7y3YP9Qv5m1vUhPxT4yebxgB2v/I6G1/RUcNb1y0kVg==
   dependencies:
     "@npmcli/arborist" "^5.0.0"
 
-libnpmhook@^8.0.2:
+libnpmhook@*:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.3.tgz#9628518a63455d21dafda312ee46175275707ff5"
   integrity sha512-TEdNI1mC5zS+w/juCgxrwwQnpbq9lY76NDOS0N37pn6pWIUxB1Yq8mwy6MUEXR1TgH4HurSQyKT6I6Kp9Wjm4A==
@@ -8398,7 +8413,7 @@ libnpmhook@^8.0.2:
     aproba "^2.0.0"
     npm-registry-fetch "^13.0.0"
 
-libnpmorg@^4.0.2:
+libnpmorg@*:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.3.tgz#a85cbdb3665ad4f7c7279d239a4581ec2eeef5a6"
   integrity sha512-r4CpmCEF+e5PbFMBi64xSXmqn0uGgV4T7NWpGL4/A6KT/DTtIxALILQZq+l0ZdN1xm4RjOvqSDR22oT4il8rAQ==
@@ -8406,7 +8421,7 @@ libnpmorg@^4.0.2:
     aproba "^2.0.0"
     npm-registry-fetch "^13.0.0"
 
-libnpmpack@^4.0.2:
+libnpmpack@*:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.1.2.tgz#9234a3b1ae433f922c19e97cd3a8a0b135b5f4cc"
   integrity sha512-megSAPeZGv9jnDM4KovKbczjyuy/EcPxCIU/iaWsDU1IEAVtBJ0qHqNUm5yN2AgN501Tb3CL6KeFGYdG4E31rQ==
@@ -8415,7 +8430,7 @@ libnpmpack@^4.0.2:
     npm-package-arg "^9.0.1"
     pacote "^13.6.1"
 
-libnpmpublish@^6.0.2:
+libnpmpublish@*:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.4.tgz#adb41ec6b0c307d6f603746a4d929dcefb8f1a0b"
   integrity sha512-lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg==
@@ -8426,14 +8441,14 @@ libnpmpublish@^6.0.2:
     semver "^7.3.7"
     ssri "^9.0.0"
 
-libnpmsearch@^5.0.2:
+libnpmsearch@*:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.3.tgz#ed502a4c2c70ea36723180455fae1357546b2184"
   integrity sha512-Ofq76qKAPhxbiyzPf/5LPjJln26VTKwU9hIU0ACxQ6tNtBJ1CHmI7iITrdp7vNezhZc0FlkXwrIpqXjhBJZgLQ==
   dependencies:
     npm-registry-fetch "^13.0.0"
 
-libnpmteam@^4.0.2:
+libnpmteam@*:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.3.tgz#9335fbbd032b3770f5c9b7ffc6203f47d1ed144a"
   integrity sha512-LsYYLz4TlTpcqkusInY5MhKjiHFaCx1GV0LmydXJ/QMh+3IWBJpUhes4ynTZuFoJKkDIFjxyMU09ul+RZixgdg==
@@ -8441,7 +8456,7 @@ libnpmteam@^4.0.2:
     aproba "^2.0.0"
     npm-registry-fetch "^13.0.0"
 
-libnpmversion@^3.0.1:
+libnpmversion@*:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.6.tgz#a4a476d38a44d38db9ac424a5e7334479e7fb8b9"
   integrity sha512-+lI+AO7cZwDxyAeWCIR8+n9XEfgSDAqmNbv4zy+H6onGthsk/+E3aa+5zIeBpyG5g268zjpc0qrBch0Q3w0nBA==
@@ -8688,7 +8703,7 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.1.5:
+make-fetch-happen@*, make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
   integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
@@ -8710,28 +8725,6 @@ make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.1.5:
     socks-proxy-agent "^7.0.0"
     ssri "^9.0.0"
 
-make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
-  dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
-
 makeerror@1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -8907,17 +8900,6 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
-  dependencies:
-    minipass "^3.1.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
-  optionalDependencies:
-    encoding "^0.1.12"
-
 minipass-fetch@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
@@ -8944,7 +8926,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -8958,14 +8940,14 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
+minipass@*, minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
   integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -9010,7 +8992,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp-infer-owner@^2.0.0:
+mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -9019,6 +9001,11 @@ mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
+mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -9026,11 +9013,6 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 moment@^2.29.1:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -9048,6 +9030,11 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+ms@*, ms@^2.0.0, ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9058,11 +9045,6 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -9100,7 +9082,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.2, negotiator@^0.6.3:
+negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9157,23 +9139,7 @@ node-gyp-build@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
   integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
 
-node-gyp@^8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
-node-gyp@^9.0.0:
+node-gyp@*, node-gyp@^9.0.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
   integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
@@ -9228,6 +9194,13 @@ node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
+nopt@*, nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -9235,13 +9208,6 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 normalize-package-data@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
@@ -9274,7 +9240,7 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-audit-report@^3.0.0:
+npm-audit-report@*:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
   integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
@@ -9300,7 +9266,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.0.2, npm-package-arg@^9.1.0:
+npm-package-arg@*, npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
   integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
@@ -9320,7 +9286,7 @@ npm-packlist@^5.1.0:
     npm-bundled "^1.1.2"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@^7.0.0, npm-pick-manifest@^7.0.1:
+npm-pick-manifest@*, npm-pick-manifest@^7.0.0:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
   integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
@@ -9330,7 +9296,7 @@ npm-pick-manifest@^7.0.0, npm-pick-manifest@^7.0.1:
     npm-package-arg "^9.0.0"
     semver "^7.3.5"
 
-npm-profile@^6.0.3:
+npm-profile@*:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.2.1.tgz#975c31ec75a6ae029ab5b8820ffdcbae3a1e3d5e"
   integrity sha512-Tlu13duByHyDd4Xy0PgroxzxnBYWbGGL5aZifNp8cx2DxUrHSoETXtPKg38aRPsBWMRfDtvcvVfJNasj7oImQQ==
@@ -9338,7 +9304,7 @@ npm-profile@^6.0.3:
     npm-registry-fetch "^13.0.1"
     proc-log "^2.0.0"
 
-npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.1.1:
+npm-registry-fetch@*, npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
   version "13.3.1"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
   integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
@@ -9372,88 +9338,86 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@^1.0.1:
+npm-user-validate@*:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
 
-npm@8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/npm/-/npm-8.11.0.tgz#224fbca389252e43dd2a277249df3320a7f91189"
-  integrity sha512-4qmtwHa28J4SPmwCNoQI07KIF/ljmBhhuqG+xNXsIIRpwdKB5OXkMIGfH6KlThR6kzusxlkgR7t1haFDB88dcQ==
-  dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
-    "@npmcli/arborist" "^5.0.4"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/config" "^4.1.0"
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/map-workspaces" "^2.0.3"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/run-script" "^3.0.1"
+npm@7.22.0:
+  version "7.22.0"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-7.22.0.tgz#11db1860c68c569eb2e3f4d4e97934b005b585bc"
+  integrity sha512-HJnjTCrGGnacPMCSnrxuHGf2H4VdrY7hwTAK1RwByg0K96KIuTR4QNioFW+bnc/pW0uwpk9lLsDf4BeEQhTv2Q==
+  dependencies:
+    "@npmcli/arborist" "^2.8.3"
+    "@npmcli/ci-detect" "^1.2.0"
+    "@npmcli/config" "^2.3.0"
+    "@npmcli/map-workspaces" "^1.0.4"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.6"
     abbrev "~1.1.1"
+    ansicolors "~0.3.2"
+    ansistyles "~0.1.3"
     archy "~1.0.0"
-    cacache "^16.1.0"
+    cacache "^15.3.0"
     chalk "^4.1.2"
     chownr "^2.0.0"
-    cli-columns "^4.0.0"
-    cli-table3 "^0.6.2"
-    columnify "^1.6.0"
+    cli-columns "^3.1.2"
+    cli-table3 "^0.6.0"
+    columnify "~1.5.4"
     fastest-levenshtein "^1.0.12"
-    glob "^8.0.1"
-    graceful-fs "^4.2.10"
-    hosted-git-info "^5.0.0"
-    ini "^3.0.0"
-    init-package-json "^3.0.2"
+    glob "^7.1.7"
+    graceful-fs "^4.2.8"
+    hosted-git-info "^4.0.2"
+    ini "^2.0.0"
+    init-package-json "^2.0.4"
     is-cidr "^4.0.2"
     json-parse-even-better-errors "^2.3.1"
-    libnpmaccess "^6.0.2"
-    libnpmdiff "^4.0.2"
-    libnpmexec "^4.0.2"
-    libnpmfund "^3.0.1"
-    libnpmhook "^8.0.2"
-    libnpmorg "^4.0.2"
-    libnpmpack "^4.0.2"
-    libnpmpublish "^6.0.2"
-    libnpmsearch "^5.0.2"
-    libnpmteam "^4.0.2"
-    libnpmversion "^3.0.1"
-    make-fetch-happen "^10.1.5"
-    minipass "^3.1.6"
+    libnpmaccess "^4.0.2"
+    libnpmdiff "^2.0.4"
+    libnpmexec "^2.0.1"
+    libnpmfund "^1.1.0"
+    libnpmhook "^6.0.2"
+    libnpmorg "^2.0.2"
+    libnpmpack "^2.0.1"
+    libnpmpublish "^4.0.1"
+    libnpmsearch "^3.1.1"
+    libnpmteam "^2.0.3"
+    libnpmversion "^1.2.1"
+    make-fetch-happen "^9.1.0"
+    minipass "^3.1.3"
     minipass-pipeline "^1.2.4"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
     ms "^2.1.2"
-    node-gyp "^9.0.0"
+    node-gyp "^7.1.2"
     nopt "^5.0.0"
-    npm-audit-report "^3.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.2"
-    npm-pick-manifest "^7.0.1"
-    npm-profile "^6.0.3"
-    npm-registry-fetch "^13.1.1"
+    npm-audit-report "^2.1.5"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.1"
+    npm-profile "^5.0.3"
+    npm-registry-fetch "^11.0.0"
     npm-user-validate "^1.0.1"
-    npmlog "^6.0.2"
+    npmlog "^5.0.1"
     opener "^1.5.2"
-    pacote "^13.4.1"
-    parse-conflict-json "^2.0.2"
-    proc-log "^2.0.1"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
     qrcode-terminal "^0.12.0"
     read "~1.0.7"
-    read-package-json "^5.0.1"
+    read-package-json "^4.1.1"
     read-package-json-fast "^2.0.3"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.7"
-    ssri "^9.0.1"
+    semver "^7.3.5"
+    ssri "^8.0.1"
     tar "^6.1.11"
     text-table "~0.2.0"
     tiny-relative-date "^1.3.0"
-    treeverse "^2.0.0"
-    validate-npm-package-name "^4.0.0"
+    treeverse "^1.0.4"
+    validate-npm-package-name "~3.0.0"
     which "^2.0.2"
-    write-file-atomic "^4.0.1"
+    write-file-atomic "^3.0.3"
 
-npmlog@^6.0.0, npmlog@^6.0.2:
+npmlog@*, npmlog@^6.0.0, npmlog@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
   integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
@@ -9589,7 +9553,7 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-opener@^1.5.2:
+opener@*:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -9752,7 +9716,7 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@^13.0.3, pacote@^13.4.1, pacote@^13.6.1:
+pacote@*, pacote@^13.0.3, pacote@^13.6.1:
   version "13.6.2"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
   integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==
@@ -9819,7 +9783,7 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-conflict-json@^2.0.1, parse-conflict-json@^2.0.2:
+parse-conflict-json@*, parse-conflict-json@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
   integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
@@ -10602,7 +10566,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qrcode-terminal@^0.12.0:
+qrcode-terminal@*:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -10854,7 +10818,7 @@ read-cmd-shim@^3.0.0:
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087"
   integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==
 
-read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10862,7 +10826,7 @@ read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@^5.0.0, read-package-json@^5.0.1:
+read-package-json@*, read-package-json@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
   integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
@@ -10872,7 +10836,7 @@ read-package-json@^5.0.0, read-package-json@^5.0.1:
     normalize-package-data "^4.0.0"
     npm-normalize-package-bin "^1.0.1"
 
-read@1, read@^1.0.7, read@~1.0.7:
+read@*, read@1, read@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
@@ -10921,7 +10885,7 @@ readdir-glob@^1.0.0:
   dependencies:
     minimatch "^5.1.0"
 
-readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -11267,7 +11231,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@*, rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -11408,6 +11372,13 @@ secp256k1@^4.0.0, secp256k1@^4.0.2:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
+semver@*, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -11423,13 +11394,6 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -11617,15 +11581,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
-  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
 socks-proxy-agent@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
@@ -11757,6 +11712,13 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
+ssri@*, ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+  dependencies:
+    minipass "^3.1.1"
+
 ssri@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
@@ -11764,20 +11726,13 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.0, ssri@^8.0.1:
+ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
     minipass "^3.1.1"
 
-ssri@^9.0.0, ssri@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -12106,7 +12061,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@*, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12194,7 +12149,7 @@ text-encoding@^0.7.0:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
   integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@*, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -12224,7 +12179,7 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
-tiny-relative-date@^1.3.0:
+tiny-relative-date@*:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -12319,7 +12274,7 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@^2.0.0:
+treeverse@*, treeverse@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
   integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
@@ -12650,7 +12605,7 @@ validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@^4.0.0:
+validate-npm-package-name@*, validate-npm-package-name@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
   integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
@@ -12904,6 +12859,13 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
+which@*, which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^1.2.12, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -12911,13 +12873,6 @@ which@^1.2.12, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
@@ -12965,6 +12920,14 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
+write-file-atomic@*, write-file-atomic@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 write-file-atomic@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
@@ -12975,14 +12938,6 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write-file-atomic@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
 write-file-atomic@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
@@ -13111,7 +13066,7 @@ yarn-audit-fix@^6.3.6:
     fs-extra "^10.0.0"
     globby "^11.0.4"
     lodash "^4.17.21"
-    npm "8.11.0"
+    npm "7.22.0"
     pkg-dir "^5.0.0"
     semver "^7.3.5"
     synp "^1.9.7"

From c4448f402e90590f4a64a92df2d560eba8e0a5ad Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Tue, 23 Aug 2022 13:28:12 -0300
Subject: [PATCH 002/132] add tokens and add nft buttons

---
 source/components/Tokens/index.jsx | 23 ++++++++++++++++++++++-
 source/components/Tokens/styles.js | 27 +++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index ba051adb..595b61b1 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -22,6 +22,7 @@ const Tokens = () => {
   const icpPrice = useICPPrice();
   const { navigator } = useRouter();
   const { onScroll, fullScroll } = useScroll();
+  const [activateButton, setActivateButton] = useState(false);
 
   const fetchAssets = () => {
     sendMessage({
@@ -75,8 +76,28 @@ const Tokens = () => {
         }
         <div className={classes.emptyAsset} />
       </div>
+      {
+        activateButton && (
+          <>
+            <div
+              onClick={() => setActivateButton(!activateButton)}
+              className={classes.addTokenButton}
+              data-testid="add-custom-token-button"
+            >
+              🪙  Add Token
+            </div>
+            <div
+              onClick={() => setActivateButton(!activateButton)}
+              className={classes.addNftButton}
+              data-testid="add-custom-token-button"
+            >
+              🎉 Add NFT
+            </div>
+          </>
+        )
+      }
       <div
-        onClick={() => navigator.navigate('add-token')}
+        onClick={() => setActivateButton(!activateButton)}
         className={classes.buttonWrapper}
         data-testid="add-custom-token-button"
       >
diff --git a/source/components/Tokens/styles.js b/source/components/Tokens/styles.js
index 34c7c831..7db9fc32 100644
--- a/source/components/Tokens/styles.js
+++ b/source/components/Tokens/styles.js
@@ -11,6 +11,33 @@ export default makeStyles((theme) => ({
     height: '100%',
     overflow: 'auto',
   },
+  addTokenButton: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    bottom: 140,
+    right: 24,
+    position: 'absolute',
+    borderRadius: 42,
+    height: 42,
+    paddingLeft: 8,
+    paddingRight: 8,
+    backgroundColor: '#A0A3A9',
+    cursor: 'pointer',
+  },
+  addNftButton: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    bottom: 82,
+    right: 24,
+    position: 'absolute',
+    borderRadius: 42,
+    height: 42,
+    padding: 5,
+    backgroundColor: '#A0A3A9',
+    cursor: 'pointer',
+  },
   buttonWrapper: {
     display: 'flex',
     justifyContent: 'center',

From d0daf121823eb2f452c5b2a8adc4175872be43a8 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Tue, 23 Aug 2022 15:42:14 -0300
Subject: [PATCH 003/132] add nft form done - form component abstraction not
 done - add nft not working yet

---
 source/components/Tokens/index.jsx            |   7 +-
 source/locales/en/translation.json            |  21 +++
 source/views/Extension/Popup.jsx              |   2 +
 .../Extension/Views/AddNFT/Steps/Step1.jsx    |  20 +++
 .../Extension/Views/AddNFT/Steps/Step2.jsx    | 109 +++++++++++
 .../Views/AddNFT/components/CustomToken.jsx   | 170 ++++++++++++++++++
 .../Extension/Views/AddNFT/hooks/useSteps.jsx |  50 ++++++
 source/views/Extension/Views/AddNFT/index.jsx |  21 +++
 source/views/Extension/Views/AddNFT/styles.js | 105 +++++++++++
 9 files changed, 501 insertions(+), 4 deletions(-)
 create mode 100644 source/views/Extension/Views/AddNFT/Steps/Step1.jsx
 create mode 100644 source/views/Extension/Views/AddNFT/Steps/Step2.jsx
 create mode 100644 source/views/Extension/Views/AddNFT/components/CustomToken.jsx
 create mode 100644 source/views/Extension/Views/AddNFT/hooks/useSteps.jsx
 create mode 100644 source/views/Extension/Views/AddNFT/index.jsx
 create mode 100644 source/views/Extension/Views/AddNFT/styles.js

diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index 595b61b1..2ded99f5 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -80,14 +80,13 @@ const Tokens = () => {
         activateButton && (
           <>
             <div
-              onClick={() => setActivateButton(!activateButton)}
+              onClick={() => navigator.navigate('add-token')}
               className={classes.addTokenButton}
               data-testid="add-custom-token-button"
-            >
-              🪙  Add Token
+            >🪙  Add Token
             </div>
             <div
-              onClick={() => setActivateButton(!activateButton)}
+              onClick={() => navigator.navigate('add-nft')}
               className={classes.addNftButton}
               data-testid="add-custom-token-button"
             >
diff --git a/source/locales/en/translation.json b/source/locales/en/translation.json
index c2312647..52a18ab9 100644
--- a/source/locales/en/translation.json
+++ b/source/locales/en/translation.json
@@ -326,6 +326,27 @@
     "selectStandard": "Select the token's interface standard",
     "importTitle": "wants to add a token to your wallet"
   },
+  "addNFT": {
+    "title": "Add NFT",
+    "search": "Search",
+    "custom": "Custom",
+    "searchText": "Add NFT's to your wallet, verified NFT's will appear in the search.",
+    "searchLink": "Learn more about NFT's",
+    "tokenCanisterId": "NFT Canister ID",
+    "confirmText": "NFT Safety Alert: For your security, make sure to do proper research before interacting with any NFT.",
+    "emptyResults": "No search results found",
+    "searchTokens": "Search NFT's",
+    "addCustomToken": "Add Custom NFT",
+    "comingSoon": "COMING SOON",
+    "dabTitle": "DAB Token List",
+    "dabText": "Helping improve discoverability, reputation, and trust in IC tokens.",
+    "invalidInterfaceTokenError": "Wrong standard. No Token Interface Detected.",
+    "invalidCanisterTokenError": "Invalid Canister ID.",
+    "standard": "NFT Standard",
+    "searchResults": "Search results",
+    "selectStandard": "Select the NFT interface standard",
+    "importTitle": "wants to add a NFT to your wallet"
+  },
   "error": {
     "errorTitle": "Something went wrong",
     "errorBody": "We’re sorry, something weird happened. \nReturn home and retry the action.",
diff --git a/source/views/Extension/Popup.jsx b/source/views/Extension/Popup.jsx
index 73793676..1f3fc187 100644
--- a/source/views/Extension/Popup.jsx
+++ b/source/views/Extension/Popup.jsx
@@ -14,6 +14,7 @@ import Deposit from './Views/Deposit';
 import Send from './Views/SendFlow';
 import Contacts from './Views/Contacts';
 import AddToken from './Views/AddToken';
+import AddNFT from './Views/AddNFT';
 import ExportIdentity from './Views/ExportIdentity';
 import Login from './Views/Login';
 import ErrorScreen from './Views/Error';
@@ -40,6 +41,7 @@ const Popup = ({ initialRoute }) => (
     <Route name="error" component={ErrorScreen} />
     <Route name="send-error" component={SendErrorScreen} />
     <Route name="add-token" component={AddToken} />
+    <Route name="add-nft" component={AddNFT} />
     <Route name="export-identity" component={ExportIdentity} />
     <Route name="nft-details" component={NFTDetails} />
     <Route name="send-nft" component={SendNFT} />
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step1.jsx b/source/views/Extension/Views/AddNFT/Steps/Step1.jsx
new file mode 100644
index 00000000..bf1afa84
--- /dev/null
+++ b/source/views/Extension/Views/AddNFT/Steps/Step1.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+
+import CustomToken from '../components/CustomToken';
+
+const Step1 = ({ handleChangeSelectedNFT }) => {
+  const { t } = useTranslation();
+  return (
+    <CustomToken
+      handleChangeSelectedNFT={handleChangeSelectedNFT}
+      />  
+  );
+};
+
+export default Step1;
+
+Step1.propTypes = {
+  handleChangeSelectedToken: PropTypes.func.isRequired,
+};
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
new file mode 100644
index 00000000..e485fa01
--- /dev/null
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -0,0 +1,109 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import PropTypes from 'prop-types';
+import { Typography } from '@material-ui/core';
+import Grid from '@material-ui/core/Grid';
+import XTCIcon from '@assets/icons/XTC.svg';
+import {
+  Button, Container, USDFormat, AssetFormat,
+  TokenIcon,
+} from '@components';
+import { USD_PER_TC, CYCLES_PER_TC } from '@shared/constants/currencies';
+import { useICPPrice } from '@redux/icp';
+import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
+import { setAssets, setAssetsLoading } from '@redux/wallet';
+import { useDispatch } from 'react-redux';
+
+import useStyles from '../styles';
+
+const cyclesToTC = cycles => cycles ? cycles / CYCLES_PER_TC : 0; // eslint-disable-line
+
+const parseTokenBySymbol = (token) => ({
+  XTC: {
+    ...token?.token,
+    amount: cyclesToTC(token.amount),
+    logo: XTCIcon,
+    price: cyclesToTC(token.amount) * USD_PER_TC,
+  },
+  WTC: {
+    ...token?.token,
+    amount: cyclesToTC(token.amount),
+    price: cyclesToTC(token.amount) * USD_PER_TC,
+  },
+})[token?.token?.symbol] || {
+  ...token?.token,
+  amount: token?.amount?.value / (10 ** token?.amount?.decimals),
+};
+
+const Step2 = ({ selectedToken, handleClose }) => {
+  const { t } = useTranslation();
+  const classes = useStyles();
+  const dispatch = useDispatch();
+  const [loading, setLoading] = useState(false);
+  const displayToken = parseTokenBySymbol(selectedToken);
+  const icpPrice = useICPPrice();
+
+  const registerToken = () => {
+    setLoading(true);
+    sendMessage({
+      type: HANDLER_TYPES.ADD_CUSTOM_TOKEN,
+      params: selectedToken?.token,
+    }, async () => {
+      sendMessage({
+        type: HANDLER_TYPES.GET_ASSETS,
+        params: { refresh: true },
+      }, (keyringAssets) => {
+        dispatch(setAssets({ keyringAssets, icpPrice }));
+        dispatch(setAssetsLoading(false));
+        setLoading(false);
+        handleClose();
+      });
+    });
+  };
+
+  return (
+    <Container>
+      <Grid container spacing={2}>
+        <Grid item xs={12}>
+          <Typography variant="subtitle1">{t('addNFT.confirmText')}</Typography>
+        </Grid>
+        <Grid item xs={12}>
+          <div className={classes.confirmToken}>
+            <TokenIcon
+              logo={displayToken.logo}
+              className={classes.tokenImage}
+              symbol={displayToken?.symbol}
+            />
+            <div className={classes.leftContainer}>
+              <Typography variant="h4">{displayToken.name}</Typography>
+              <Typography variant="subtitle1"><AssetFormat value={displayToken?.amount} asset={displayToken?.symbol} /></Typography>
+            </div>
+            {!!displayToken.price && (
+              <div className={classes.rightContainer}>
+                <Typography variant="h4"><USDFormat value={displayToken?.price} /></Typography>
+              </div>
+            )}
+          </div>
+        </Grid>
+        <Grid item xs={12}>
+          <Button
+            variant="rainbow"
+            value={t('common.add')}
+            onClick={registerToken}
+            loading={loading}
+            disabled={loading}
+            fullWidth
+            data-testid="add-button"
+          />
+        </Grid>
+      </Grid>
+    </Container>
+  );
+};
+
+export default Step2;
+
+Step2.propTypes = {
+  selectedToken: PropTypes.objectOf(PropTypes.string).isRequired,
+  handleClose: PropTypes.func.isRequired,
+};
diff --git a/source/views/Extension/Views/AddNFT/components/CustomToken.jsx b/source/views/Extension/Views/AddNFT/components/CustomToken.jsx
new file mode 100644
index 00000000..fe46c947
--- /dev/null
+++ b/source/views/Extension/Views/AddNFT/components/CustomToken.jsx
@@ -0,0 +1,170 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import Grid from '@material-ui/core/Grid';
+import { useTranslation } from 'react-i18next';
+import {
+  Button,
+  FormItem,
+  TextInput,
+  Container,
+  Alert,
+  Dialog,
+  Select,
+} from '@components';
+import { validateCanisterId } from '@shared/utils/ids';
+import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
+import extension from 'extensionizer';
+import { customTokensUrl } from '@shared/constants/urls';
+import useStyles from '../styles';
+
+const FUNGIBLE_STANDARDS = { DIP721: 'DIP721', EXT: 'EXT', DIP721v2: 'DIP721 v2', };
+
+const CustomToken = ({ handleChangeSelectedNFT }) => {
+  const { t } = useTranslation();
+  const [canisterId, setCanisterId] = useState('');
+  const [standard, setStandard] = useState(FUNGIBLE_STANDARDS.DIP721);
+  const [invalidToken, setInvalidToken] = useState(null);
+  const [tokenError, setTokenError] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [dialogOpen, setDialogOpen] = useState(false);
+  const classes = useStyles();
+
+  const handleChangeId = (e) => {
+    setCanisterId(e.target.value.trim());
+    setTokenError('');
+  };
+
+  useEffect(() => {
+    if (canisterId) {
+      setInvalidToken(!validateCanisterId(canisterId));
+    }
+  }, [canisterId]);
+
+  const handleSubmit = () => {
+    setLoading(true);
+    sendMessage(
+      {
+        type: HANDLER_TYPES.GET_TOKEN_INFO,
+        params: { canisterId, standard },
+      },
+      async (tokenInfo) => {
+        if (tokenInfo?.error) {
+          setTokenError(tokenInfo?.error);
+        } else {
+          handleChangeSelectedNFT(tokenInfo)();
+        }
+        setLoading(false);
+      },
+    );
+  };
+  const handleCloseDialog = (value) => {
+    setStandard(value?.name ?? standard);
+    setDialogOpen(false);
+    setTokenError('');
+  };
+
+  const isInvalidInterfaceError = tokenError.includes('Call failed:');
+  const isInvalidCanisterError = tokenError === 'The provided canister id is invalid';
+  const isNFTNotSupportedError = tokenError === 'Non fungible tokens are not supported yet';
+
+  return (
+    <Container style={{ paddingTop: 24 }}>
+      <Grid container spacing={2}>
+        <Grid item xs={12}>
+          <FormItem
+            smallLabel
+            label={t('addNFT.tokenCanisterId')}
+            component={(
+              <TextInput
+                fullWidth
+                value={canisterId}
+                onChange={handleChangeId}
+                type="text"
+                error={invalidToken}
+                data-testid="token-canister-id-input"
+              />
+            )}
+          />
+        </Grid>
+        <Grid item xs={12}>
+          <FormItem
+            smallLabel
+            label={t('addNFT.standard')}
+            component={(
+              <Select
+                image=""
+                name={standard}
+                onClick={() => setDialogOpen(true)}
+                shadow
+                className={classes.select}
+                data-testid="token-standard-select"
+              />
+            )}
+          />
+        </Grid>
+        {dialogOpen && (
+          <Dialog
+            title={t('addNFT.selectStandard')}
+            items={Object.values(FUNGIBLE_STANDARDS).map((name) => ({ name }))}
+            onClose={handleCloseDialog}
+            selectedValue={standard}
+            open={dialogOpen}
+            menuItemTestId="standard-item"
+          />
+        )}
+        {tokenError && (
+          <Grid item xs={12}>
+            <div className={classes.appearAnimation}>
+              <Alert
+                type="danger"
+                title={(
+                  <div>
+                    <span data-testid="token-error">
+                      {isInvalidCanisterError
+                        ? t('addNFT.invalidCanisterTokenError')
+                        : isNFTNotSupportedError
+                          ? t('addNFT.nftTokenError')
+                          : isInvalidInterfaceError
+                            ? t('addNFT.invalidInterfaceTokenError')
+                            : tokenError}
+                    </span>
+                    {(isInvalidCanisterError
+                      || isNFTNotSupportedError
+                      || isInvalidInterfaceError) && (
+                      <>
+                        <br />
+                        <span
+                          className={classes.learnMore}
+                          onClick={() => extension.tabs.create({ url: customTokensUrl })}
+                        >
+                          {t('common.learnMore')}
+                        </span>
+                      </>
+                    )}
+                  </div>
+                )}
+              />
+            </div>
+          </Grid>
+        )}
+        <Grid item xs={12}>
+          <Button
+            variant="rainbow"
+            value={t('common.continue')}
+            onClick={handleSubmit}
+            fullWidth
+            disabled={!canisterId || invalidToken || loading}
+            loading={loading}
+            data-testid="continue-button"
+          />
+        </Grid>
+      </Grid>
+    </Container>
+  );
+};
+
+export default CustomToken;
+
+CustomToken.propTypes = {
+  handleChangeSelectedNFT: PropTypes.func.isRequired,
+};
diff --git a/source/views/Extension/Views/AddNFT/hooks/useSteps.jsx b/source/views/Extension/Views/AddNFT/hooks/useSteps.jsx
new file mode 100644
index 00000000..5f8ca987
--- /dev/null
+++ b/source/views/Extension/Views/AddNFT/hooks/useSteps.jsx
@@ -0,0 +1,50 @@
+import React, { useState } from 'react';
+import { LinkButton } from '@components';
+import { useTranslation } from 'react-i18next';
+import { useRouter } from '@components/Router';
+import BackIcon from '@assets/icons/back.svg';
+import Step1 from '../Steps/Step1';
+import Step2 from '../Steps/Step2';
+
+const useSteps = () => {
+  const [step, setStep] = useState(0);
+  const { navigator } = useRouter();
+  const { t } = useTranslation();
+
+  const [selectedToken, setSelectedToken] = useState(null);
+
+  const handleChangeSelectedNFT = (token) => () => {
+    setSelectedToken(token);
+    setStep(1);
+  };
+
+  const handleChangeStep = (index) => setStep(index);
+  const handleClose = () => navigator.navigate('home');
+
+  const leftButton = (onClick) => <LinkButton value={t('common.back')} onClick={onClick} startIcon={BackIcon} />;
+  const rightButton = <LinkButton value={t('common.close')} onClick={() => handleClose()} />;
+
+  const steps = [
+    {
+      component: <Step1
+      handleChangeSelectedNFT={handleChangeSelectedNFT}
+      />,
+      left: leftButton(() => handleClose()),
+      right: rightButton,
+      center: t('addNFT.title'),
+    },
+    {
+      component: <Step2
+        handleClose={handleClose}
+        selectedToken={selectedToken}
+      />,
+      left: leftButton(() => handleChangeStep(0)),
+      right: rightButton,
+      center: t('addNFT.title'),
+    },
+  ];
+
+  return steps[step];
+};
+
+export default useSteps;
diff --git a/source/views/Extension/Views/AddNFT/index.jsx b/source/views/Extension/Views/AddNFT/index.jsx
new file mode 100644
index 00000000..45797c38
--- /dev/null
+++ b/source/views/Extension/Views/AddNFT/index.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { Layout, Header } from '@components';
+import useSteps from './hooks/useSteps';
+
+const AddNFT = () => {
+  const {
+    component,
+    left,
+    right,
+    center,
+  } = useSteps();
+
+  return (
+    <Layout>
+      <Header left={left} center={center} right={right} />
+      {component}
+    </Layout>
+  );
+};
+
+export default AddNFT;
diff --git a/source/views/Extension/Views/AddNFT/styles.js b/source/views/Extension/Views/AddNFT/styles.js
new file mode 100644
index 00000000..28ec80a0
--- /dev/null
+++ b/source/views/Extension/Views/AddNFT/styles.js
@@ -0,0 +1,105 @@
+import { makeStyles } from '@material-ui/core/styles';
+
+export default makeStyles((theme) => ({
+  centered: {
+    textAlign: 'center',
+    padding: '0 32px',
+  },
+  tokenItem: {
+    cursor: 'pointer',
+    display: 'flex',
+    alignItems: 'center',
+    padding: '6px 0',
+  },
+  tokenImage: {
+    position: 'relative',
+    height: 41,
+    width: 41,
+    marginRight: theme.spacing(1),
+  },
+  verified: {
+    position: 'absolute',
+    top: -20,
+    right: -20,
+  },
+  confirmToken: {
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'flex-start',
+    padding: `${theme.spacing(1)}px 0`,
+  },
+  leftContainer: {
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'space-evenly',
+  },
+  rightContainer: {
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'space-evenly',
+    marginLeft: 'auto',
+    textAlign: 'end',
+  },
+  emptyResults: {
+    display: 'flex',
+    justifyContent: 'center',
+    flexDirection: 'column',
+    alignItems: 'center',
+    width: '100%',
+    height: 190,
+    margin: '12px 0',
+  },
+  emoji: {
+    fontSize: 32,
+  },
+  tokensContainer: {
+    height: 202,
+    margin: '0 0 12px 0',
+    overflow: 'auto',
+  },
+  poweredByDab: {
+    position: 'absolute',
+    margin: 'auto',
+    left: 0,
+    right: 0,
+    bottom: 8,
+  },
+  dabTokenContainer: {
+    height: 190,
+    margin: '12px 0',
+    display: 'flex',
+    flexDirection: 'column',
+    justifyContent: 'space-evenly',
+    position: 'relative',
+    alignItems: 'center',
+    textAlign: 'center',
+    padding: '0 12px',
+  },
+  dabImage: {
+    height: 57,
+    width: 57,
+    cursor: 'pointer',
+  },
+  '@keyframes appear': {
+    '0%': {
+      opacity: '0',
+      height: 0,
+    },
+    '100%': {
+      opacity: '1',
+      height: 51,
+    },
+  },
+  appearAnimation: {
+    animationName: '$appear',
+    animationDuration: '0.5s',
+  },
+  learnMore: {
+    textDecoration: 'underline',
+    cursor: 'pointer',
+  },
+  select: {
+    height: 47,
+    borderRadius: 6,
+  },
+}));

From 3ff69524d16c436dfedcd188ba91d9edd73cc0b5 Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Mon, 29 Aug 2022 11:51:38 +0200
Subject: [PATCH 004/132] feat: tests initialization

---
 .../components/ConnectionControls/index.jsx   |    2 +
 .../components/NetworkCard/index.jsx          |   11 +-
 .../components/NetworkSelector/index.jsx      |    2 +
 tests/e2e/add-network.test.js                 |   58 +
 yarn.lock                                     | 1339 ++++++++++-------
 5 files changed, 835 insertions(+), 577 deletions(-)
 create mode 100644 tests/e2e/add-network.test.js

diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index 41c2418b..6c60920b 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -137,6 +137,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
         <div
           className={classes.networkSelector}
           onClick={() => setSelectorOpen(true)}
+          data-testid="network-selector"
         >
           <div
             className={clsx(
@@ -170,6 +171,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
           <NetworkSelector
             onClose={() => setSelectorOpen(false)}
             refreshWallet={refreshWallet}
+            data-testid="network-select-modal"
           />
         )}
       </div>
diff --git a/source/components/ConnectionStatus/components/NetworkCard/index.jsx b/source/components/ConnectionStatus/components/NetworkCard/index.jsx
index 6aaf0a12..6e8c2db6 100644
--- a/source/components/ConnectionStatus/components/NetworkCard/index.jsx
+++ b/source/components/ConnectionStatus/components/NetworkCard/index.jsx
@@ -10,7 +10,10 @@ import { setUseICNS } from '@redux/icns';
 
 import useStyles from './styles';
 
-const NetworkCard = ({ network, withDivider, onClick }) => {
+const NetworkCard = ({
+  network,
+  withDivider, onClick, NetworkCardTestId,
+}) => {
   const classes = useStyles();
   const { currentNetwork } = useSelector((state) => state.network);
   const dispatch = useDispatch();
@@ -26,6 +29,7 @@ const NetworkCard = ({ network, withDivider, onClick }) => {
       <div
         className={clsx(classes.network, active && classes.activeNetwork)}
         onClick={selectNetwork(network.id)}
+        data-testid={`${NetworkCardTestId}-${network.name}`}
       >
         <div className={classes.networkId}>
           <div className={clsx(
@@ -44,6 +48,10 @@ const NetworkCard = ({ network, withDivider, onClick }) => {
   );
 };
 
+NetworkCard.defaultProps = {
+  NetworkCardTestId: PropTypes.string,
+};
+
 NetworkCard.propTypes = {
   network: PropTypes.shape({
     id: PropTypes.string.isRequired,
@@ -51,6 +59,7 @@ NetworkCard.propTypes = {
   }).isRequired,
   withDivider: PropTypes.bool.isRequired,
   onClick: PropTypes.func.isRequired,
+  NetworkCardTestId: PropTypes.string,
 };
 
 export default NetworkCard;
diff --git a/source/components/ConnectionStatus/components/NetworkSelector/index.jsx b/source/components/ConnectionStatus/components/NetworkSelector/index.jsx
index edfcc1a5..7460783c 100644
--- a/source/components/ConnectionStatus/components/NetworkSelector/index.jsx
+++ b/source/components/ConnectionStatus/components/NetworkSelector/index.jsx
@@ -29,6 +29,7 @@ const NetworkSelector = ({ onClose, refreshWallet }) => {
             value={t('common.add')}
             style={{ height: 27, minWidth: 75 }}
             onClick={() => navigator.navigate('create-network')}
+            data-testid="add-network-button"
           />
         </div>
         <div className={classes.networksContainer}>
@@ -37,6 +38,7 @@ const NetworkSelector = ({ onClose, refreshWallet }) => {
               network={network}
               withDivider={index < networks.length - 1}
               onClick={handleNetworkClick}
+              NetworkCardTestId="network-card"
             />
           ))}
         </div>
diff --git a/tests/e2e/add-network.test.js b/tests/e2e/add-network.test.js
new file mode 100644
index 00000000..4a8fd24b
--- /dev/null
+++ b/tests/e2e/add-network.test.js
@@ -0,0 +1,58 @@
+const depositViewButtonClick = async (page) => {
+  const depositViewButton = await page.getByTestId('open-deposit-view-button', true);
+  await depositViewButton.click();
+};
+
+const checkIsCopyButtonTextMatch = async (page, name, id) => {
+  const copyButton = await page.getByTestId(`copy-${name}-button`, true);
+  await copyButton.click();
+  const copiedText = await page.evaluate(() => navigator.clipboard.readText());
+  expect(copiedText).toBe(id);
+};
+
+const qrCodeIconButtonClick = async (page) => {
+  const qrCodeIconButton = await page.getByTestId('qr-code-icon-button', true);
+  await qrCodeIconButton.click();
+};
+
+const closeQrCodeModalButtonClick = async (page) => {
+  const qrCodeIconButton = await page.getByTestId('close-qr-code-modal-button', true);
+  await qrCodeIconButton.click();
+};
+
+const checkIsSubtitleTextMatch = async (page, name, text) => {
+  const subtitle = await page.getByTestId(`deposit-${name}-subtitle`, true);
+  const subtitleText = await page.evaluate((el) => el.textContent, subtitle);
+  expect(subtitleText).toBe(text);
+};
+
+describe('Add Network View', () => {
+  let browser;
+  let page;
+
+  beforeAll(async () => {
+    browser = await setupChrome();
+
+    // Importing and unlocking the accoun
+    page = await utils.createNewPage(browser);
+
+    await optionsPageUtils.importAccount(page, secrets.seedphrase, secrets.password);
+    await optionsPageUtils.unlock(page, secrets.password);
+    await depositViewButtonClick(page);
+  });
+
+  afterAll(async () => {
+    await browser.close();
+  });
+
+  test('deposit view content is rendered correctly', async () => {
+    await checkIsSubtitleTextMatch(page, principalId, principalIdSubtitle);
+    await checkIsSubtitleTextMatch(page, accountId, accountIdSubtitle);
+
+    await checkIsCopyButtonTextMatch(page, principalId, secrets.mainPrincipalId);
+    await checkIsCopyButtonTextMatch(page, accountId, secrets.mainAccountId);
+
+    await qrCodeIconButtonClick(page);
+    await closeQrCodeModalButtonClick(page);
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index 58f75d40..63916d15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1114,7 +1114,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1145,7 +1145,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/string-locale-compare@^1.1.0":
+"@isaacs/string-locale-compare@^1.0.1":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -1589,71 +1589,64 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@*", "@npmcli/arborist@^5.0.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.0.tgz#ace635279d0d548df164ac83464237fd5f0175ad"
-  integrity sha512-gM2AxWCaXTZRZnKOHT6uIUHTkvRf+UPU2iC/3nC1Bj21zemnoKyJh2NvcG69UCcfs+r1jpx6hZ0dL9s2yPssJQ==
+"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.8.3":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c"
+  integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA==
   dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
+    "@isaacs/string-locale-compare" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/map-workspaces" "^2.0.3"
-    "@npmcli/metavuln-calculator" "^3.0.1"
-    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/map-workspaces" "^1.0.2"
+    "@npmcli/metavuln-calculator" "^1.1.0"
+    "@npmcli/move-file" "^1.1.0"
     "@npmcli/name-from-folder" "^1.0.1"
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/query" "^1.1.1"
-    "@npmcli/run-script" "^4.1.3"
-    bin-links "^3.0.0"
-    cacache "^16.0.6"
+    "@npmcli/node-gyp" "^1.0.1"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.2"
+    bin-links "^2.2.1"
+    cacache "^15.0.3"
     common-ancestor-path "^1.0.1"
     json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
-    minimatch "^5.1.0"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.0"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    parse-conflict-json "^2.0.1"
-    proc-log "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.0"
+    npm-registry-fetch "^11.0.0"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
+    proc-log "^1.0.0"
     promise-all-reject-late "^1.0.0"
     promise-call-limit "^1.0.1"
     read-package-json-fast "^2.0.2"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.7"
-    ssri "^9.0.0"
-    treeverse "^2.0.0"
+    semver "^7.3.5"
+    ssri "^8.0.1"
+    treeverse "^1.0.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/ci-detect@*", "@npmcli/ci-detect@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
-  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
+"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
+  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
 
-"@npmcli/config@*":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.2.1.tgz#7a4b46f4a315fe369a3f8543c67fae0b89549a40"
-  integrity sha512-iJEnXNAGGr7sGUcoKmeJNrc943vFiWrDWq6DNK/t+SuqoObmozMb3tN3G5T9yo3uBf5Cw4h+SWgoqSaiwczl0Q==
+"@npmcli/config@^2.3.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.4.0.tgz#1447b0274f9502871dabd3ab1d8302472d515b1f"
+  integrity sha512-fwxu/zaZnvBJohXM3igzqa3P1IVYWi5N343XcKvKkJbAx+rTqegS5tAul4NLiMPQh6WoS5a4er6oo/ieUx1f4g==
   dependencies:
-    "@npmcli/map-workspaces" "^2.0.2"
-    ini "^3.0.0"
+    ini "^2.0.0"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    proc-log "^2.0.0"
-    read-package-json-fast "^2.0.3"
-    semver "^7.3.5"
+    nopt "^5.0.0"
+    semver "^7.3.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/disparity-colors@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
-  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
+"@npmcli/disparity-colors@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
+  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
   dependencies:
     ansi-styles "^4.3.0"
 
@@ -1665,30 +1658,21 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/fs@^2.1.0", "@npmcli/fs@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/git@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931"
-  integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==
+"@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
-    "@npmcli/promise-spawn" "^3.0.0"
-    lru-cache "^7.4.4"
+    "@npmcli/promise-spawn" "^1.3.2"
+    lru-cache "^6.0.0"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^7.0.0"
-    proc-log "^2.0.0"
+    npm-pick-manifest "^6.1.1"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.7":
+"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -1696,27 +1680,26 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
-  integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg==
+"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
+  integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
   dependencies:
     "@npmcli/name-from-folder" "^1.0.1"
-    glob "^8.0.1"
-    minimatch "^5.0.1"
-    read-package-json-fast "^2.0.3"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+    read-package-json-fast "^2.0.1"
 
-"@npmcli/metavuln-calculator@^3.0.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622"
-  integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA==
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
   dependencies:
-    cacache "^16.0.0"
-    json-parse-even-better-errors "^2.3.1"
-    pacote "^13.0.3"
-    semver "^7.3.5"
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
 
-"@npmcli/move-file@^1.0.1":
+"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
@@ -1724,57 +1707,39 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/name-from-folder@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
   integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/node-gyp@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
-  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
+  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
-"@npmcli/package-json@*", "@npmcli/package-json@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
-  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+"@npmcli/package-json@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
+  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
   dependencies:
     json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/promise-spawn@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
-  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/query@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-1.1.1.tgz#462c4268473ae39e89d5fefbad94d9af7e1217c4"
-  integrity sha512-UF3I0fD94wzQ84vojMO2jDB8ibjRSTqhi8oz2mzVKiJ9gZHbeGlu9kzPvgHuGDK0Hf2cARhWtTfCDHNEwlL9hg==
+"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6":
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
+  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
   dependencies:
-    npm-package-arg "^9.1.0"
-    postcss-selector-parser "^6.0.10"
-    semver "^7.3.7"
-
-"@npmcli/run-script@*", "@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946"
-  integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==
-  dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^9.0.0"
-    read-package-json-fast "^2.0.3"
-    which "^2.0.2"
+    "@npmcli/node-gyp" "^1.0.2"
+    "@npmcli/promise-spawn" "^1.3.2"
+    node-gyp "^7.1.0"
+    read-package-json-fast "^2.0.1"
 
 "@psychedelic/browser-rpc@2.1.0":
   version "2.1.0"
@@ -1929,11 +1894,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.1.19"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
@@ -2437,7 +2397,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@*, abbrev@1, abbrev@^1.0.0:
+abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2495,7 +2455,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -2522,7 +2482,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2559,7 +2519,7 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
+ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2593,12 +2553,12 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
   integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
 
-ansicolors@*:
+ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
 
-ansistyles@*:
+ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
   integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
@@ -2619,16 +2579,16 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 archiver-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
@@ -2658,19 +2618,27 @@ archiver@^5.3.0:
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
-archy@*:
+archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2790,6 +2758,18 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, 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==
+
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2845,6 +2825,16 @@ autoprefixer@^10.0.2:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
 axe-core@^4.4.2:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
@@ -3660,6 +3650,13 @@ bash-path@^1.0.1:
     arr-union "^3.1.0"
     is-windows "^1.0.1"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3677,17 +3674,17 @@ bignumber.js@^9.0.0:
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
   integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
 
-bin-links@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.2.tgz#5c40f14b0742faa2ae952caa76b4a29090befcbb"
-  integrity sha512-+oSWBdbCUK6X4LOCSrU36fWRzZNaK7/evX7GozR9xwl2dyiVi3UOUwTyyOVYI1FstgugfsM9QESRrWo7gjCYbg==
+bin-links@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967"
+  integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA==
   dependencies:
-    cmd-shim "^5.0.0"
+    cmd-shim "^4.0.1"
     mkdirp-infer-owner "^2.0.0"
     npm-normalize-package-bin "^1.0.0"
-    read-cmd-shim "^3.0.0"
+    read-cmd-shim "^2.0.0"
     rimraf "^3.0.0"
-    write-file-atomic "^4.0.0"
+    write-file-atomic "^3.0.3"
 
 binary-extensions@^1.0.0:
   version "1.13.1"
@@ -3970,36 +3967,10 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
-
-cacache@*, cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
-  version "16.1.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.2.tgz#a519519e9fc9e5e904575dcd3b77660cbf03f749"
-  integrity sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^1.1.1"
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -4022,7 +3993,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.5:
+cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -4138,10 +4109,10 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-chalk@*:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
-  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 chalk@^1.1.3:
   version "1.1.3"
@@ -4218,16 +4189,16 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@*, chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
 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==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -4293,13 +4264,13 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-columns@*:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
-  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
+cli-columns@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
+  integrity sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==
   dependencies:
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.1"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -4308,7 +4279,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@*:
+cli-table3@^0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
   integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
@@ -4381,10 +4352,10 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
-cmd-shim@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
-  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
@@ -4402,6 +4373,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4447,7 +4423,7 @@ color-string@1.5.5, color-string@^0.3.0, color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -4479,15 +4455,15 @@ colors@1.4.0, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@*:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==
   dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4581,7 +4557,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -4662,6 +4638,11 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+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==
+
 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"
@@ -5054,6 +5035,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5399,6 +5387,14 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 ed25519-hd-key@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ed25519-hd-key/-/ed25519-hd-key-1.2.0.tgz#819d43c6a96477c9385bd121dccc94dbc6c6598c"
@@ -5466,7 +5462,7 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-encoding@^0.1.13:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -5986,6 +5982,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extensionizer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/extensionizer/-/extensionizer-1.0.1.tgz#504544239a7610ba8404b15c1832091a37768d09"
@@ -6016,6 +6017,16 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+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==
+
 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"
@@ -6054,11 +6065,6 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fastest-levenshtein@*:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
-  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
-
 fastest-levenshtein@^1.0.12:
   version "1.0.14"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz#9054384e4b7a78c88d01a4432dc18871af0ac859"
@@ -6292,6 +6298,11 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -6301,6 +6312,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 fraction.js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
@@ -6405,19 +6425,34 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    wide-align "^1.1.2"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6475,6 +6510,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-parent@5.1.2, glob-parent@^3.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -6487,18 +6529,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@*, glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6582,11 +6613,24 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.8, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -6640,7 +6684,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
@@ -6742,12 +6786,12 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@*, hosted-git-info@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
-  integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
+hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
-    lru-cache "^7.5.1"
+    lru-cache "^6.0.0"
 
 hsl-regex@^1.0.0:
   version "1.0.0"
@@ -6830,14 +6874,14 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -6922,12 +6966,12 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore-walk@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
-  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+ignore-walk@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
-    minimatch "^5.0.1"
+    minimatch "^3.0.4"
 
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
@@ -7011,33 +7055,28 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-ini@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
-
 ini@^1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ini@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1"
-  integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-init-package-json@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
-  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
+init-package-json@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
   dependencies:
-    npm-package-arg "^9.0.1"
+    npm-package-arg "^8.1.5"
     promzard "^0.3.0"
-    read "^1.0.7"
-    read-package-json "^5.0.0"
+    read "~1.0.1"
+    read-package-json "^4.1.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^4.0.0"
+    validate-npm-package-name "^3.0.0"
 
 internal-slot@^1.0.3:
   version "1.0.3"
@@ -7145,7 +7184,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@*:
+is-cidr@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
   integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
@@ -7164,6 +7203,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.5.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -7232,6 +7278,18 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
 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"
@@ -7385,7 +7443,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -7439,6 +7497,11 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -8037,6 +8100,11 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsconfig-paths-jest-mapper@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsconfig-paths-jest-mapper/-/jsconfig-paths-jest-mapper-1.0.0.tgz#cd8570e9f6eabb33890b27eb51bc7b6e91a8564e"
@@ -8099,7 +8167,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   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==
@@ -8114,6 +8182,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8124,6 +8197,11 @@ json-stringify-nice@^1.1.4:
   resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
   integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
 
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json-text-sequence@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2"
@@ -8157,6 +8235,16 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
 jss-plugin-camel-case@^10.5.1:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
@@ -8240,15 +8328,15 @@ junk@^3.1.0:
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
-just-diff-apply@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b"
-  integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g==
+just-diff-apply@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
+  integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
 
-just-diff@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202"
-  integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ==
+just-diff@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
+  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
 
 keycode@^2.1.7:
   version "2.2.1"
@@ -8354,118 +8442,115 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@*:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded"
-  integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg==
+libnpmaccess@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
 
-libnpmdiff@*:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.4.tgz#487ccb609dacd7f558f089feef3153933e157d02"
-  integrity sha512-bUz12309DdkeFL/K0sKhW1mbg8DARMbNI0vQKrJp1J8lxhxqkAjzSQ3eQCacFjSwCz4xaf630ogwuOkSt61ZEQ==
+libnpmdiff@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
+  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
   dependencies:
-    "@npmcli/disparity-colors" "^2.0.0"
+    "@npmcli/disparity-colors" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
     binary-extensions "^2.2.0"
     diff "^5.0.0"
-    minimatch "^5.0.1"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    minimatch "^3.0.4"
+    npm-package-arg "^8.1.1"
+    pacote "^11.3.0"
     tar "^6.1.0"
 
-libnpmexec@*:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.11.tgz#3307fd7b683630268237936a921f5faadd5bfaef"
-  integrity sha512-uhkAWVT0pA1kVgqgTjIMVebOPl3PpIvVcRQ1IBV47ppVxmQr+JCjDahrV0K/0JUsKSVFozyGEEmg1Kz0HwRwzw==
+libnpmexec@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
+  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
   dependencies:
-    "@npmcli/arborist" "^5.0.0"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/fs" "^2.1.1"
-    "@npmcli/run-script" "^4.2.0"
+    "@npmcli/arborist" "^2.3.0"
+    "@npmcli/ci-detect" "^1.3.0"
+    "@npmcli/run-script" "^1.8.4"
     chalk "^4.1.0"
     mkdirp-infer-owner "^2.0.0"
-    npm-package-arg "^9.0.1"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    proc-log "^2.0.0"
+    npm-package-arg "^8.1.2"
+    pacote "^11.3.1"
+    proc-log "^1.0.0"
     read "^1.0.7"
     read-package-json-fast "^2.0.2"
-    semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.2.tgz#7da0827950f0db2cce0acb0dc7652d1834a8b239"
-  integrity sha512-wmFMP/93Wjy+jDg5LaSldDgAhSgCyA64JUUmp806Kae7y3YP9Qv5m1vUhPxT4yebxgB2v/I6G1/RUcNb1y0kVg==
+libnpmfund@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
+  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
   dependencies:
-    "@npmcli/arborist" "^5.0.0"
+    "@npmcli/arborist" "^2.5.0"
 
-libnpmhook@*:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.3.tgz#9628518a63455d21dafda312ee46175275707ff5"
-  integrity sha512-TEdNI1mC5zS+w/juCgxrwwQnpbq9lY76NDOS0N37pn6pWIUxB1Yq8mwy6MUEXR1TgH4HurSQyKT6I6Kp9Wjm4A==
+libnpmhook@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30"
+  integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmorg@*:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.3.tgz#a85cbdb3665ad4f7c7279d239a4581ec2eeef5a6"
-  integrity sha512-r4CpmCEF+e5PbFMBi64xSXmqn0uGgV4T7NWpGL4/A6KT/DTtIxALILQZq+l0ZdN1xm4RjOvqSDR22oT4il8rAQ==
+libnpmorg@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc"
+  integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmpack@*:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.1.2.tgz#9234a3b1ae433f922c19e97cd3a8a0b135b5f4cc"
-  integrity sha512-megSAPeZGv9jnDM4KovKbczjyuy/EcPxCIU/iaWsDU1IEAVtBJ0qHqNUm5yN2AgN501Tb3CL6KeFGYdG4E31rQ==
+libnpmpack@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
+  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
   dependencies:
-    "@npmcli/run-script" "^4.1.3"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    "@npmcli/run-script" "^1.8.3"
+    npm-package-arg "^8.1.0"
+    pacote "^11.2.6"
 
-libnpmpublish@*:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.4.tgz#adb41ec6b0c307d6f603746a4d929dcefb8f1a0b"
-  integrity sha512-lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg==
+libnpmpublish@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
   dependencies:
-    normalize-package-data "^4.0.0"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
-    semver "^7.3.7"
-    ssri "^9.0.0"
+    normalize-package-data "^3.0.2"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
+    semver "^7.1.3"
+    ssri "^8.0.1"
 
-libnpmsearch@*:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.3.tgz#ed502a4c2c70ea36723180455fae1357546b2184"
-  integrity sha512-Ofq76qKAPhxbiyzPf/5LPjJln26VTKwU9hIU0ACxQ6tNtBJ1CHmI7iITrdp7vNezhZc0FlkXwrIpqXjhBJZgLQ==
+libnpmsearch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3"
+  integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==
   dependencies:
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmteam@*:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.3.tgz#9335fbbd032b3770f5c9b7ffc6203f47d1ed144a"
-  integrity sha512-LsYYLz4TlTpcqkusInY5MhKjiHFaCx1GV0LmydXJ/QMh+3IWBJpUhes4ynTZuFoJKkDIFjxyMU09ul+RZixgdg==
+libnpmteam@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c"
+  integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmversion@*:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.6.tgz#a4a476d38a44d38db9ac424a5e7334479e7fb8b9"
-  integrity sha512-+lI+AO7cZwDxyAeWCIR8+n9XEfgSDAqmNbv4zy+H6onGthsk/+E3aa+5zIeBpyG5g268zjpc0qrBch0Q3w0nBA==
+libnpmversion@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9"
+  integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/run-script" "^4.1.3"
+    "@npmcli/git" "^2.0.7"
+    "@npmcli/run-script" "^1.8.4"
     json-parse-even-better-errors "^2.3.1"
-    proc-log "^2.0.0"
-    semver "^7.3.7"
+    semver "^7.3.5"
+    stringify-package "^1.0.1"
 
 lilconfig@2.0.5:
   version "2.0.5"
@@ -8683,11 +8768,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
-  integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
-
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -8703,27 +8783,27 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@*, make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
+make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
     http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
+    http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
     minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
+    minipass-fetch "^1.3.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
+    negotiator "^0.6.2"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
 
 makeerror@1.0.12:
   version "1.0.12"
@@ -8838,7 +8918,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8881,7 +8961,7 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
@@ -8900,16 +8980,16 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
-  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
   dependencies:
-    minipass "^3.1.6"
+    minipass "^3.1.0"
     minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
+    minizlib "^2.0.0"
   optionalDependencies:
-    encoding "^0.1.13"
+    encoding "^0.1.12"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
@@ -8926,7 +9006,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -8940,14 +9020,14 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@*, minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
   integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -8992,7 +9072,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
+mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -9001,11 +9081,6 @@ mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -9013,6 +9088,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 moment@^2.29.1:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -9030,11 +9110,6 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@*, ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9045,6 +9120,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -9082,7 +9162,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.3:
+negotiator@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9139,20 +9219,20 @@ node-gyp-build@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
   integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
 
-node-gyp@*, node-gyp@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
-  integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
+node-gyp@^7.1.0, node-gyp@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
+    graceful-fs "^4.2.3"
     nopt "^5.0.0"
-    npmlog "^6.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
     rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -9194,13 +9274,6 @@ node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-nopt@*, nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -9208,15 +9281,15 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
-  integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
-    hosted-git-info "^5.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -9240,24 +9313,24 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-audit-report@*:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
-  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
+npm-audit-report@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
   dependencies:
     chalk "^4.0.0"
 
-npm-bundled@^1.1.1, npm-bundled@^1.1.2:
+npm-bundled@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
-  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
@@ -9266,56 +9339,53 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@*, npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
-  integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
   dependencies:
-    hosted-git-info "^5.0.0"
-    proc-log "^2.0.1"
-    semver "^7.3.5"
-    validate-npm-package-name "^4.0.0"
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
 
-npm-packlist@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
-  integrity sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==
+npm-packlist@^2.1.4:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
-    glob "^8.0.1"
-    ignore-walk "^5.0.1"
-    npm-bundled "^1.1.2"
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@*, npm-pick-manifest@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
-  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
   dependencies:
-    npm-install-checks "^5.0.0"
+    npm-install-checks "^4.0.0"
     npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^9.0.0"
-    semver "^7.3.5"
+    npm-package-arg "^8.1.2"
+    semver "^7.3.4"
 
-npm-profile@*:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.2.1.tgz#975c31ec75a6ae029ab5b8820ffdcbae3a1e3d5e"
-  integrity sha512-Tlu13duByHyDd4Xy0PgroxzxnBYWbGGL5aZifNp8cx2DxUrHSoETXtPKg38aRPsBWMRfDtvcvVfJNasj7oImQQ==
+npm-profile@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
+  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
   dependencies:
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    npm-registry-fetch "^11.0.0"
 
-npm-registry-fetch@*, npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
-  integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
+npm-registry-fetch@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
   dependencies:
-    make-fetch-happen "^10.0.6"
-    minipass "^3.1.6"
-    minipass-fetch "^2.0.3"
+    make-fetch-happen "^9.0.1"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^9.0.1"
-    proc-log "^2.0.0"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -9338,7 +9408,7 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@*:
+npm-user-validate@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
@@ -9417,14 +9487,24 @@ npm@7.22.0:
     which "^2.0.2"
     write-file-atomic "^3.0.3"
 
-npmlog@*, npmlog@^6.0.0, npmlog@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
-    are-we-there-yet "^3.0.0"
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
+  dependencies:
+    are-we-there-yet "^2.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.3"
+    gauge "^3.0.0"
     set-blocking "^2.0.0"
 
 nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
@@ -9434,11 +9514,21 @@ nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+
 nwsapi@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
   integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
 
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -9553,7 +9643,7 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-opener@*:
+opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -9716,32 +9806,30 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@*, pacote@^13.0.3, pacote@^13.6.1:
-  version "13.6.2"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
-  integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==
+pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5:
+  version "11.3.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
+  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/promise-spawn" "^3.0.0"
-    "@npmcli/run-script" "^4.1.0"
-    cacache "^16.0.0"
+    "@npmcli/git" "^2.1.0"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.8.2"
+    cacache "^15.0.5"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.6"
-    mkdirp "^1.0.4"
-    npm-package-arg "^9.0.0"
-    npm-packlist "^5.1.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^2.1.4"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^11.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^5.0.0"
-    read-package-json-fast "^2.0.3"
+    read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
+    ssri "^8.0.1"
+    tar "^6.1.0"
 
 pako@~1.0.5:
   version "1.0.11"
@@ -9783,14 +9871,14 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-conflict-json@*, parse-conflict-json@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
-  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+parse-conflict-json@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
+  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
   dependencies:
-    json-parse-even-better-errors "^2.3.1"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
+    json-parse-even-better-errors "^2.3.0"
+    just-diff "^3.0.1"
+    just-diff-apply "^3.0.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -9914,6 +10002,11 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -10278,7 +10371,7 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10387,10 +10480,10 @@ private@^0.1.6:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-proc-log@^2.0.0, proc-log@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
-  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+proc-log@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
+  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -10481,7 +10574,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
-psl@^1.1.33:
+psl@^1.1.28, psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -10566,7 +10659,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qrcode-terminal@*:
+qrcode-terminal@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -10581,6 +10674,11 @@ qrcode@^1.4.4:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
 query-string@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
@@ -10813,12 +10911,12 @@ react@^17.0.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-cmd-shim@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087"
-  integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==
+read-cmd-shim@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10826,24 +10924,24 @@ read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@*, read-package-json@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
-  integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
+read-package-json@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
-    glob "^8.0.1"
-    json-parse-even-better-errors "^2.3.1"
-    normalize-package-data "^4.0.0"
-    npm-normalize-package-bin "^1.0.1"
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
 
-read@*, read@1, read@^1.0.7:
+read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   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==
@@ -10885,7 +10983,7 @@ readdir-glob@^1.0.0:
   dependencies:
     minimatch "^5.1.0"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -11086,6 +11184,32 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -11231,7 +11355,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-rimraf@*, rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -11296,7 +11420,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -11372,13 +11496,6 @@ secp256k1@^4.0.0, secp256k1@^4.0.2:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-semver@*, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -11394,6 +11511,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -11408,7 +11532,7 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -11581,10 +11705,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+socks-proxy-agent@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
@@ -11712,12 +11836,20 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-ssri@*, ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
+sshpk@^1.7.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
   version "6.0.2"
@@ -11726,7 +11858,7 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -11803,6 +11935,15 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11812,6 +11953,14 @@ string-length@^4.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -11874,6 +12023,11 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -11881,6 +12035,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -12061,7 +12222,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@*, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12149,7 +12310,7 @@ text-encoding@^0.7.0:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
   integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==
 
-text-table@*, 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 sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -12179,7 +12340,7 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
-tiny-relative-date@*:
+tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -12257,6 +12418,14 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -12274,10 +12443,10 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@*, treeverse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
-  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
@@ -12299,11 +12468,23 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -12575,6 +12756,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuidv4@^6.2.13:
   version "6.2.13"
   resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-6.2.13.tgz#8f95ec5ef22d1f92c8e5d4c70b735d1c89572cb7"
@@ -12597,7 +12783,7 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
 
-validate-npm-package-license@^3.0.4:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -12605,18 +12791,27 @@ validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@*, validate-npm-package-name@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
-  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
   dependencies:
-    builtins "^5.0.0"
+    builtins "^1.0.3"
 
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -12859,13 +13054,6 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
-which@*, which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^1.2.12, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -12873,7 +13061,14 @@ which@^1.2.12, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.5:
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -12920,15 +13115,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@*, write-file-atomic@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==

From aac9c5fc26c09255c0b9389d002f43ee80e5ec4a Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 29 Aug 2022 12:27:51 -0300
Subject: [PATCH 005/132] added get-nft-info method

---
 source/Background/Keyring/index.js              | 17 +++++++++++++++++
 .../Views/AddNFT/components/CustomToken.jsx     | 10 ++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 1efc3001..a5bfa0a1 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -87,6 +87,7 @@ export const HANDLER_TYPES = {
   EDIT_PRINCIPAL: 'edit-principal',
   GET_PUBLIC_KEY: 'get-public-key',
   GET_TOKEN_INFO: 'get-token-info',
+  GET_NFT_INFO: 'get-nft-info',
   ADD_CUSTOM_TOKEN: 'add-custom-token',
   CREATE_PRINCIPAL: 'create-principal',
   SET_CURRENT_PRINCIPAL: 'set-current-principal',
@@ -121,6 +122,7 @@ export const getKeyringErrorMessage = (type) => ({
   [HANDLER_TYPES.EDIT_PRINCIPAL]: 'editing your principal.',
   [HANDLER_TYPES.GET_PUBLIC_KEY]: 'getting your public key.',
   [HANDLER_TYPES.GET_TOKEN_INFO]: 'fetching token info.',
+  [HANDLER_TYPES.GET_NFT_INFO]: 'fetching nft info.',
   [HANDLER_TYPES.ADD_CUSTOM_TOKEN]: 'adding custom token.',
   [HANDLER_TYPES.CREATE_PRINCIPAL]: 'creating your principal.',
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]: 'setting your principal.',
@@ -279,6 +281,21 @@ export const getKeyringHandler = (type, keyring) => ({
         return { error: e.message };
       }
     },
+  [HANDLER_TYPES.GET_NFT_INFO]:
+    async ({ canisterId, standard }) => {
+      try {
+        const nftInfo = await keyring.getNFTInfo({
+          canisterId,
+          standard,
+        });
+        console.log(nftInfo);
+        return { nftInfo };
+      } catch (e) {
+        // eslint-disable-next-line
+        console.log('Error while fetching NFT info', e);
+        return { error: e.message };
+      }
+    },
   [HANDLER_TYPES.ADD_CUSTOM_TOKEN]:
     async ({ canisterId, standard, logo }) => {
       try {
diff --git a/source/views/Extension/Views/AddNFT/components/CustomToken.jsx b/source/views/Extension/Views/AddNFT/components/CustomToken.jsx
index fe46c947..400077d4 100644
--- a/source/views/Extension/Views/AddNFT/components/CustomToken.jsx
+++ b/source/views/Extension/Views/AddNFT/components/CustomToken.jsx
@@ -44,12 +44,13 @@ const CustomToken = ({ handleChangeSelectedNFT }) => {
     setLoading(true);
     sendMessage(
       {
-        type: HANDLER_TYPES.GET_TOKEN_INFO,
+        type: HANDLER_TYPES.GET_NFT_INFO,
         params: { canisterId, standard },
       },
-      async (tokenInfo) => {
-        if (tokenInfo?.error) {
-          setTokenError(tokenInfo?.error);
+      async (nftInfo) => {
+        if (nftInfo?.error) {
+          console.log('ocrrio un error al devolver la info', nftInfo);
+          setTokenError(nftInfo?.error);
         } else {
           handleChangeSelectedNFT(tokenInfo)();
         }
@@ -57,6 +58,7 @@ const CustomToken = ({ handleChangeSelectedNFT }) => {
       },
     );
   };
+
   const handleCloseDialog = (value) => {
     setStandard(value?.name ?? standard);
     setDialogOpen(false);

From 1ce73c23032eed8dfce17b4c092b51ea9f05be63 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 31 Aug 2022 12:54:18 -0300
Subject: [PATCH 006/132] added few changes

---
 package.json                                  |    3 +-
 source/assets/icons/coins.svg                 |    3 +
 source/assets/icons/imageIcon.svg             |    3 +
 .../Tokens/components/TokenSelector/index.jsx |   39 +
 .../Tokens/components/TokenSelector/styles.js |   72 +
 source/components/Tokens/index.jsx            |   21 +-
 source/components/Tokens/styles.js            |   12 +-
 .../Extension/Views/AddNFT/Steps/Step1.jsx    |    4 +-
 .../{CustomToken.jsx => CustomNFT.jsx}        |    6 +-
 yarn.lock                                     | 1431 +++++++++--------
 10 files changed, 939 insertions(+), 655 deletions(-)
 create mode 100644 source/assets/icons/coins.svg
 create mode 100644 source/assets/icons/imageIcon.svg
 create mode 100644 source/components/Tokens/components/TokenSelector/index.jsx
 create mode 100644 source/components/Tokens/components/TokenSelector/styles.js
 rename source/views/Extension/Views/AddNFT/components/{CustomToken.jsx => CustomNFT.jsx} (97%)

diff --git a/package.json b/package.json
index 7f78de7a..4bdd6a40 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,8 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.7",
+    "@psychedelic/dab-js-test": "1.4.7",
+    "@psychedelic/plug-controller": "/Users/cancu/Dev/plug-controller",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/assets/icons/coins.svg b/source/assets/icons/coins.svg
new file mode 100644
index 00000000..856d2bf4
--- /dev/null
+++ b/source/assets/icons/coins.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.75 13.834V15.1875C0.75 16.3477 3.48926 17.25 6.9375 17.25C10.3213 17.25 13.125 16.3477 13.125 15.1875V13.834C11.7715 14.7686 9.35449 15.1875 6.9375 15.1875C4.48828 15.1875 2.07129 14.7686 0.75 13.834ZM11.0625 4.875C14.4463 4.875 17.25 3.97266 17.25 2.8125C17.25 1.68457 14.4785 0.75 11.0625 0.75C7.61426 0.75 4.875 1.68457 4.875 2.8125C4.875 3.97266 7.61426 4.875 11.0625 4.875ZM0.75 10.4502V12.0938C0.75 13.2539 3.48926 14.1562 6.9375 14.1562C10.3213 14.1562 13.125 13.2539 13.125 12.0938V10.4502C11.7715 11.5459 9.35449 12.0938 6.9375 12.0938C4.48828 12.0938 2.07129 11.5459 0.75 10.4502ZM14.1562 10.8047C15.9932 10.4502 17.25 9.77344 17.25 9V7.64648C16.4766 8.16211 15.3809 8.5166 14.1562 8.74219V10.8047ZM6.9375 5.90625C3.48926 5.90625 0.75 7.06641 0.75 8.48438C0.75 9.93457 3.48926 11.0625 6.9375 11.0625C10.3213 11.0625 13.125 9.93457 13.125 8.48438C13.125 7.06641 10.3213 5.90625 6.9375 5.90625ZM13.9951 7.74316C15.9287 7.38867 17.25 6.71191 17.25 5.90625V4.55273C16.0898 5.3584 14.124 5.77734 12.0615 5.90625C12.9961 6.35742 13.7051 6.96973 13.9951 7.74316Z" fill="#111827" fill-opacity="0.4"/>
+</svg>
diff --git a/source/assets/icons/imageIcon.svg b/source/assets/icons/imageIcon.svg
new file mode 100644
index 00000000..6d1716f7
--- /dev/null
+++ b/source/assets/icons/imageIcon.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="15" viewBox="0 0 18 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.1875 0.5H2.8125C1.68457 0.5 0.75 1.43457 0.75 2.5625V12.875C0.75 14.0352 1.68457 14.9375 2.8125 14.9375H15.1875C16.3154 14.9375 17.25 14.0352 17.25 12.875V2.5625C17.25 1.43457 16.3477 0.5 15.1875 0.5ZM4.35938 2.5625C5.19727 2.5625 5.90625 3.27148 5.90625 4.10938C5.90625 4.97949 5.22949 5.65625 4.35938 5.65625C3.45703 5.65625 2.8125 4.97949 2.8125 4.10938C2.8125 3.27148 3.52148 2.5625 4.35938 2.5625ZM15.1553 12.6172C15.0586 12.7783 14.8652 12.875 14.7041 12.875H3.4248C3.19922 12.875 3.03809 12.7783 2.94141 12.6172C2.87695 12.4238 2.87695 12.2305 3.00586 12.0693L5.26172 8.97559C5.3584 8.84668 5.4873 8.75 5.68066 8.75C5.8418 8.75 5.9707 8.84668 6.06738 8.97559L7.13086 10.4258L10.1279 5.91406C10.2246 5.75293 10.3857 5.65625 10.5791 5.65625C10.7402 5.65625 10.9014 5.75293 10.998 5.91406L15.123 12.1016C15.2197 12.2305 15.2197 12.4561 15.1553 12.6172Z" fill="#111827" fill-opacity="0.4"/>
+</svg>
diff --git a/source/components/Tokens/components/TokenSelector/index.jsx b/source/components/Tokens/components/TokenSelector/index.jsx
new file mode 100644
index 00000000..2bcad841
--- /dev/null
+++ b/source/components/Tokens/components/TokenSelector/index.jsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import coins from '@assets/icons/coins.svg';
+import imageIcon from '@assets/icons/imageIcon.svg';
+import useStyles from './styles';
+
+// eslint-disable-next-line react/prop-types
+const TokenSelector = ({ onClose }) => {
+  const classes = useStyles();
+  return (
+    <>
+      <div>
+        <div
+          onClick={() => navigator.navigate('add-token')}
+          className={classes.addTokenButton}
+          data-testid="add-custom-token-button"
+        >
+          <img
+            src={coins}
+            alt="reload"
+          />  Add Token
+        </div>
+        <div
+          onClick={() => navigator.navigate('add-nft')}
+          className={classes.addNftButton}
+          data-testid="add-custom-token-button"
+        >
+          <img
+            src={imageIcon}
+            alt="reload"
+          />
+          Add NFT
+        </div>
+      </div>
+      <div className={classes.background} onClick={onClose} />
+    </>
+  );
+};
+
+export default TokenSelector;
diff --git a/source/components/Tokens/components/TokenSelector/styles.js b/source/components/Tokens/components/TokenSelector/styles.js
new file mode 100644
index 00000000..24a82745
--- /dev/null
+++ b/source/components/Tokens/components/TokenSelector/styles.js
@@ -0,0 +1,72 @@
+import { makeStyles } from '@material-ui/core/styles';
+
+export default makeStyles(() => ({
+  addTokenButton: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    bottom: 140,
+    right: 24,
+    position: 'absolute',
+    borderRadius: 42,
+    height: 42,
+    paddingLeft: 8,
+    paddingRight: 8,
+    backgroundColor: '#FFFFF',
+    cursor: 'pointer',
+    border: 2,
+    borderStyle: 'solid',
+    borderColor: '#A0A3A9',
+    gap: 4,
+  },
+  addNftButton: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    bottom: 82,
+    right: 24,
+    position: 'absolute',
+    borderRadius: 42,
+    height: 42,
+    padding: 5,
+    backgroundColor: '#FFFFF',
+    border: 2,
+    borderStyle: 'solid',
+    borderColor: '#A0A3A9',
+    cursor: 'pointer',
+    gap: 4,
+  },
+  background: {
+    width: '100%',
+    height: 595,
+    zIndex: 5,
+    position: 'absolute',
+    top: 0,
+    right: 0,
+  },
+  selectorContainer: {
+    display: 'flex',
+    flexDirection: 'column',
+    width: 250,
+    padding: '20px 20px 0 20px',
+    position: 'absolute',
+    top: 50,
+    right: 10,
+    background: '#FFFFFF',
+    borderRadius: 6,
+    // boxShadow: SHADOW_1,
+    zIndex: 10000,
+  },
+  selectorHeader: {
+    display: 'flex',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+  },
+  networksContainer: {
+    display: 'flex',
+    flexDirection: 'column',
+    zIndex: 10,
+    maxHeight: 330,
+    overflow: 'auto',
+  },
+}));
diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index 2ded99f5..63999d5b 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -5,13 +5,14 @@ import { setAssets, setAssetsLoading } from '@redux/wallet';
 import clsx from 'clsx';
 
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import { useRouter } from '@components/Router';
+// import { useRouter } from '@components/Router';
 
 import { useICPPrice } from '@redux/icp';
 import { setICNSData } from '@redux/icns';
 import { useScroll } from '@hooks';
 import AssetItem from '../AssetItem';
 import useStyles from './styles';
+import TokenSelector from './components/TokenSelector';
 
 const Tokens = () => {
   const classes = useStyles();
@@ -20,7 +21,7 @@ const Tokens = () => {
   const [loading, setLoading] = useState(true);
   const dispatch = useDispatch();
   const icpPrice = useICPPrice();
-  const { navigator } = useRouter();
+  // const { navigator } = useRouter();
   const { onScroll, fullScroll } = useScroll();
   const [activateButton, setActivateButton] = useState(false);
 
@@ -78,21 +79,7 @@ const Tokens = () => {
       </div>
       {
         activateButton && (
-          <>
-            <div
-              onClick={() => navigator.navigate('add-token')}
-              className={classes.addTokenButton}
-              data-testid="add-custom-token-button"
-            >🪙  Add Token
-            </div>
-            <div
-              onClick={() => navigator.navigate('add-nft')}
-              className={classes.addNftButton}
-              data-testid="add-custom-token-button"
-            >
-              🎉 Add NFT
-            </div>
-          </>
+          <TokenSelector onClose={() => setActivateButton(false)} />
         )
       }
       <div
diff --git a/source/components/Tokens/styles.js b/source/components/Tokens/styles.js
index 7db9fc32..a126c55a 100644
--- a/source/components/Tokens/styles.js
+++ b/source/components/Tokens/styles.js
@@ -22,8 +22,12 @@ export default makeStyles((theme) => ({
     height: 42,
     paddingLeft: 8,
     paddingRight: 8,
-    backgroundColor: '#A0A3A9',
+    backgroundColor: '#FFFFF',
     cursor: 'pointer',
+    border: 2,
+    borderStyle: 'solid',
+    borderColor: '#A0A3A9',
+    gap: 4,
   },
   addNftButton: {
     display: 'flex',
@@ -35,8 +39,12 @@ export default makeStyles((theme) => ({
     borderRadius: 42,
     height: 42,
     padding: 5,
-    backgroundColor: '#A0A3A9',
+    backgroundColor: '#FFFFF',
+    border: 2,
+    borderStyle: 'solid',
+    borderColor: '#A0A3A9',
     cursor: 'pointer',
+    gap: 4,
   },
   buttonWrapper: {
     display: 'flex',
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step1.jsx b/source/views/Extension/Views/AddNFT/Steps/Step1.jsx
index bf1afa84..f0bec7dd 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step1.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step1.jsx
@@ -2,12 +2,12 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 
-import CustomToken from '../components/CustomToken';
+import CustomNFT from '../components/CustomNFT';
 
 const Step1 = ({ handleChangeSelectedNFT }) => {
   const { t } = useTranslation();
   return (
-    <CustomToken
+    <CustomNFT
       handleChangeSelectedNFT={handleChangeSelectedNFT}
       />  
   );
diff --git a/source/views/Extension/Views/AddNFT/components/CustomToken.jsx b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
similarity index 97%
rename from source/views/Extension/Views/AddNFT/components/CustomToken.jsx
rename to source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
index 400077d4..10c0375e 100644
--- a/source/views/Extension/Views/AddNFT/components/CustomToken.jsx
+++ b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
@@ -19,7 +19,7 @@ import useStyles from '../styles';
 
 const FUNGIBLE_STANDARDS = { DIP721: 'DIP721', EXT: 'EXT', DIP721v2: 'DIP721 v2', };
 
-const CustomToken = ({ handleChangeSelectedNFT }) => {
+const CustomNFT = ({ handleChangeSelectedNFT }) => {
   const { t } = useTranslation();
   const [canisterId, setCanisterId] = useState('');
   const [standard, setStandard] = useState(FUNGIBLE_STANDARDS.DIP721);
@@ -165,8 +165,8 @@ const CustomToken = ({ handleChangeSelectedNFT }) => {
   );
 };
 
-export default CustomToken;
+export default CustomNFT;
 
-CustomToken.propTypes = {
+CustomNFT.propTypes = {
   handleChangeSelectedNFT: PropTypes.func.isRequired,
 };
diff --git a/yarn.lock b/yarn.lock
index 13fd61d9..8f3527f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1114,7 +1114,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1145,7 +1145,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/string-locale-compare@^1.1.0":
+"@isaacs/string-locale-compare@^1.0.1":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -1589,71 +1589,64 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@^5.0.0", "@npmcli/arborist@^5.0.4":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.0.tgz#ace635279d0d548df164ac83464237fd5f0175ad"
-  integrity sha512-gM2AxWCaXTZRZnKOHT6uIUHTkvRf+UPU2iC/3nC1Bj21zemnoKyJh2NvcG69UCcfs+r1jpx6hZ0dL9s2yPssJQ==
+"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.8.3":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c"
+  integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA==
   dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
+    "@isaacs/string-locale-compare" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/map-workspaces" "^2.0.3"
-    "@npmcli/metavuln-calculator" "^3.0.1"
-    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/map-workspaces" "^1.0.2"
+    "@npmcli/metavuln-calculator" "^1.1.0"
+    "@npmcli/move-file" "^1.1.0"
     "@npmcli/name-from-folder" "^1.0.1"
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/query" "^1.1.1"
-    "@npmcli/run-script" "^4.1.3"
-    bin-links "^3.0.0"
-    cacache "^16.0.6"
+    "@npmcli/node-gyp" "^1.0.1"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.2"
+    bin-links "^2.2.1"
+    cacache "^15.0.3"
     common-ancestor-path "^1.0.1"
     json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
-    minimatch "^5.1.0"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.0"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    parse-conflict-json "^2.0.1"
-    proc-log "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.0"
+    npm-registry-fetch "^11.0.0"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
+    proc-log "^1.0.0"
     promise-all-reject-late "^1.0.0"
     promise-call-limit "^1.0.1"
     read-package-json-fast "^2.0.2"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.7"
-    ssri "^9.0.0"
-    treeverse "^2.0.0"
+    semver "^7.3.5"
+    ssri "^8.0.1"
+    treeverse "^1.0.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/ci-detect@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
-  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
+"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
+  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
 
-"@npmcli/config@^4.1.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.2.1.tgz#7a4b46f4a315fe369a3f8543c67fae0b89549a40"
-  integrity sha512-iJEnXNAGGr7sGUcoKmeJNrc943vFiWrDWq6DNK/t+SuqoObmozMb3tN3G5T9yo3uBf5Cw4h+SWgoqSaiwczl0Q==
+"@npmcli/config@^2.3.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.4.0.tgz#1447b0274f9502871dabd3ab1d8302472d515b1f"
+  integrity sha512-fwxu/zaZnvBJohXM3igzqa3P1IVYWi5N343XcKvKkJbAx+rTqegS5tAul4NLiMPQh6WoS5a4er6oo/ieUx1f4g==
   dependencies:
-    "@npmcli/map-workspaces" "^2.0.2"
-    ini "^3.0.0"
+    ini "^2.0.0"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    proc-log "^2.0.0"
-    read-package-json-fast "^2.0.3"
-    semver "^7.3.5"
+    nopt "^5.0.0"
+    semver "^7.3.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/disparity-colors@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
-  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
+"@npmcli/disparity-colors@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
+  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
   dependencies:
     ansi-styles "^4.3.0"
 
@@ -1665,30 +1658,21 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/fs@^2.1.0", "@npmcli/fs@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/git@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931"
-  integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==
+"@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
-    "@npmcli/promise-spawn" "^3.0.0"
-    lru-cache "^7.4.4"
+    "@npmcli/promise-spawn" "^1.3.2"
+    lru-cache "^6.0.0"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^7.0.0"
-    proc-log "^2.0.0"
+    npm-pick-manifest "^6.1.1"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.7":
+"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -1696,27 +1680,26 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
-  integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg==
+"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
+  integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
   dependencies:
     "@npmcli/name-from-folder" "^1.0.1"
-    glob "^8.0.1"
-    minimatch "^5.0.1"
-    read-package-json-fast "^2.0.3"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+    read-package-json-fast "^2.0.1"
 
-"@npmcli/metavuln-calculator@^3.0.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622"
-  integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA==
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
   dependencies:
-    cacache "^16.0.0"
-    json-parse-even-better-errors "^2.3.1"
-    pacote "^13.0.3"
-    semver "^7.3.5"
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
 
-"@npmcli/move-file@^1.0.1":
+"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
@@ -1724,67 +1707,39 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/name-from-folder@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
   integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/node-gyp@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
-  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
+  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
-"@npmcli/package-json@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
-  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+"@npmcli/package-json@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
+  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
   dependencies:
     json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/promise-spawn@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
-  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/query@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-1.1.1.tgz#462c4268473ae39e89d5fefbad94d9af7e1217c4"
-  integrity sha512-UF3I0fD94wzQ84vojMO2jDB8ibjRSTqhi8oz2mzVKiJ9gZHbeGlu9kzPvgHuGDK0Hf2cARhWtTfCDHNEwlL9hg==
-  dependencies:
-    npm-package-arg "^9.1.0"
-    postcss-selector-parser "^6.0.10"
-    semver "^7.3.7"
-
-"@npmcli/run-script@^3.0.1":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-3.0.3.tgz#66afa6e0c4c3484056195f295fa6c1d1a45ddf58"
-  integrity sha512-ZXL6qgC5NjwfZJ2nET+ZSLEz/PJgJ/5CU90C2S66dZY4Jw73DasS4ZCXuy/KHWYP0imjJ4VtA+Gebb5BxxKp9Q==
-  dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^8.4.1"
-    read-package-json-fast "^2.0.3"
-
-"@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946"
-  integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==
+"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6":
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
+  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
   dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^9.0.0"
-    read-package-json-fast "^2.0.3"
-    which "^2.0.2"
+    "@npmcli/node-gyp" "^1.0.2"
+    "@npmcli/promise-spawn" "^1.3.2"
+    node-gyp "^7.1.0"
+    read-package-json-fast "^2.0.1"
 
 "@psychedelic/browser-rpc@2.1.0":
   version "2.1.0"
@@ -1806,6 +1761,20 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
+"@psychedelic/dab-js-test@1.4.7":
+  version "1.4.7"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js-test/1.4.7/2c0de3b66de07f9410c8edc8fc799a9b22236d5d#2c0de3b66de07f9410c8edc8fc799a9b22236d5d"
+  integrity sha512-+zc5O0gbPFno0ljh+9+XwvEYf30VCswluPAnatmB6xVmR6eQIZw2DqbLclTDRhNQIE+hP/pjUwXsqDWINjhOhA==
+  dependencies:
+    "@dfinity/agent" "0.9.3"
+    "@dfinity/candid" "0.9.3"
+    "@dfinity/identity" "0.9.3"
+    "@dfinity/principal" "0.9.3"
+    axios "^0.24.0"
+    buffer-crc32 "^0.2.13"
+    cross-fetch "^3.1.4"
+    crypto-js "^4.1.1"
+
 "@psychedelic/dab-js@1.4.5":
   version "1.4.5"
   resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.5/eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f#eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f"
@@ -1820,31 +1789,46 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/dab-js@1.4.6":
-  version "1.4.6"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.6/8c06156d4c51634e2a35a837e3b89d18f246ce0e#8c06156d4c51634e2a35a837e3b89d18f246ce0e"
-  integrity sha512-p5MhoUikpqb+osqjg4dthiKFYt9X4EMKPOBbe6OD20iOxvmTIqQ3dqejwXSJO28ohFCnZseRG+UQsfoz+6jhTw==
+"@psychedelic/plug-controller@/Users/cancu/Dev/plug-controller":
+  version "0.19.8"
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
-    axios "^0.24.0"
+    "@psychedelic/cap-js" "0.0.7"
+    "@psychedelic/dab-js-test" "1.4.7"
+    "@types/secp256k1" "^4.0.3"
+    axios "^0.21.1"
+    babel-jest "^25.5.1"
+    bigint-conversion "^2.2.1"
+    bip39 "^3.0.4"
     buffer-crc32 "^0.2.13"
+    create-hmac "^1.1.7"
     cross-fetch "^3.1.4"
-    crypto-js "^4.1.1"
+    crypto-js "^4.0.0"
+    ed25519-hd-key "^1.2.0"
+    extensionizer "^1.0.1"
+    hdkey "^2.0.1"
+    js-sha256 "^0.9.0"
+    json-bigint "^1.0.0"
+    random-color "^1.0.1"
+    reflect-metadata "^0.1.13"
+    secp256k1 "^4.0.2"
+    text-encoding "^0.7.0"
+    text-encoding-shim "^1.0.5"
+    tweetnacl "^1.0.3"
+    uuidv4 "^6.2.13"
 
-"@psychedelic/plug-controller@0.19.7":
-  version "0.19.7"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.7/5c35f85f934acc1e243ec81ef5e1cd7a2b261680#5c35f85f934acc1e243ec81ef5e1cd7a2b261680"
-  integrity sha512-Hl8CjJwCY9nzntP7S75btzhMXsynS0IE1LqswiE905AACCY5vkA9ZfWW8tq4O3TM20PXJGeNSokJf0BBzXSzdg==
+"@psychedelic/plug-controller@file:../plug-controller":
+  version "0.19.8"
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.6"
+    "@psychedelic/dab-js-test" "1.4.7"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"
@@ -1939,11 +1923,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.1.19"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
@@ -2447,7 +2426,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1, abbrev@^1.0.0, abbrev@~1.1.1:
+abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2505,7 +2484,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -2532,7 +2511,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2569,7 +2548,7 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
+ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2603,6 +2582,16 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
   integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
 
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
+
+ansistyles@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
+  integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -2619,16 +2608,16 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 archiver-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
@@ -2663,14 +2652,22 @@ archy@~1.0.0:
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2790,6 +2787,18 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, 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==
+
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2845,6 +2854,16 @@ autoprefixer@^10.0.2:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
 axe-core@^4.4.2:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
@@ -3660,6 +3679,13 @@ bash-path@^1.0.1:
     arr-union "^3.1.0"
     is-windows "^1.0.1"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3677,17 +3703,17 @@ bignumber.js@^9.0.0:
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
   integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
 
-bin-links@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.2.tgz#5c40f14b0742faa2ae952caa76b4a29090befcbb"
-  integrity sha512-+oSWBdbCUK6X4LOCSrU36fWRzZNaK7/evX7GozR9xwl2dyiVi3UOUwTyyOVYI1FstgugfsM9QESRrWo7gjCYbg==
+bin-links@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967"
+  integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA==
   dependencies:
-    cmd-shim "^5.0.0"
+    cmd-shim "^4.0.1"
     mkdirp-infer-owner "^2.0.0"
     npm-normalize-package-bin "^1.0.0"
-    read-cmd-shim "^3.0.0"
+    read-cmd-shim "^2.0.0"
     rimraf "^3.0.0"
-    write-file-atomic "^4.0.0"
+    write-file-atomic "^3.0.3"
 
 binary-extensions@^1.0.0:
   version "1.13.1"
@@ -3970,12 +3996,10 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -3998,7 +4022,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.5, cacache@^15.2.0:
+cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -4022,30 +4046,6 @@ cacache@^15.0.5, cacache@^15.2.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
-  version "16.1.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.2.tgz#a519519e9fc9e5e904575dcd3b77660cbf03f749"
-  integrity sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^1.1.1"
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -4138,6 +4138,11 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -4288,13 +4293,13 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-columns@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
-  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
+cli-columns@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
+  integrity sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==
   dependencies:
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.1"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -4303,7 +4308,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@^0.6.2:
+cli-table3@^0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
   integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
@@ -4376,10 +4381,10 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
-cmd-shim@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
-  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
@@ -4397,6 +4402,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4442,7 +4452,7 @@ color-string@1.5.5, color-string@^0.3.0, color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -4474,15 +4484,15 @@ colors@1.4.0, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==
   dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4576,7 +4586,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -4657,6 +4667,11 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+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==
+
 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"
@@ -5049,6 +5064,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5394,6 +5416,14 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 ed25519-hd-key@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ed25519-hd-key/-/ed25519-hd-key-1.2.0.tgz#819d43c6a96477c9385bd121dccc94dbc6c6598c"
@@ -5461,7 +5491,7 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-encoding@^0.1.12, encoding@^0.1.13:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -5981,6 +6011,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extensionizer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/extensionizer/-/extensionizer-1.0.1.tgz#504544239a7610ba8404b15c1832091a37768d09"
@@ -6011,6 +6046,16 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+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==
+
 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"
@@ -6282,6 +6327,11 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -6291,6 +6341,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 fraction.js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
@@ -6395,19 +6454,34 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    wide-align "^1.1.2"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6465,6 +6539,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-parent@5.1.2, glob-parent@^3.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -6477,7 +6558,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6489,17 +6570,6 @@ glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
@@ -6572,11 +6642,24 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.8, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -6630,7 +6713,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
@@ -6732,12 +6815,12 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
-  integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
+hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
-    lru-cache "^7.5.1"
+    lru-cache "^6.0.0"
 
 hsl-regex@^1.0.0:
   version "1.0.0"
@@ -6820,14 +6903,14 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -6912,12 +6995,12 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore-walk@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
-  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+ignore-walk@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
-    minimatch "^5.0.1"
+    minimatch "^3.0.4"
 
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
@@ -7006,23 +7089,23 @@ ini@^1.3.4:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ini@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1"
-  integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-init-package-json@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
-  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
+init-package-json@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
   dependencies:
-    npm-package-arg "^9.0.1"
+    npm-package-arg "^8.1.5"
     promzard "^0.3.0"
-    read "^1.0.7"
-    read-package-json "^5.0.0"
+    read "~1.0.1"
+    read-package-json "^4.1.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^4.0.0"
+    validate-npm-package-name "^3.0.0"
 
 internal-slot@^1.0.3:
   version "1.0.3"
@@ -7149,6 +7232,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.5.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -7217,6 +7307,18 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
 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"
@@ -7370,7 +7472,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -7424,6 +7526,11 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -8022,6 +8129,11 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsconfig-paths-jest-mapper@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsconfig-paths-jest-mapper/-/jsconfig-paths-jest-mapper-1.0.0.tgz#cd8570e9f6eabb33890b27eb51bc7b6e91a8564e"
@@ -8099,6 +8211,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8109,6 +8226,11 @@ json-stringify-nice@^1.1.4:
   resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
   integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
 
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json-text-sequence@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2"
@@ -8142,6 +8264,16 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
 jss-plugin-camel-case@^10.5.1:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
@@ -8225,15 +8357,15 @@ junk@^3.1.0:
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
-just-diff-apply@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b"
-  integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g==
+just-diff-apply@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
+  integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
 
-just-diff@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202"
-  integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ==
+just-diff@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
+  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
 
 keycode@^2.1.7:
   version "2.2.1"
@@ -8339,118 +8471,115 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded"
-  integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg==
+libnpmaccess@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
 
-libnpmdiff@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.4.tgz#487ccb609dacd7f558f089feef3153933e157d02"
-  integrity sha512-bUz12309DdkeFL/K0sKhW1mbg8DARMbNI0vQKrJp1J8lxhxqkAjzSQ3eQCacFjSwCz4xaf630ogwuOkSt61ZEQ==
+libnpmdiff@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
+  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
   dependencies:
-    "@npmcli/disparity-colors" "^2.0.0"
+    "@npmcli/disparity-colors" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
     binary-extensions "^2.2.0"
     diff "^5.0.0"
-    minimatch "^5.0.1"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    minimatch "^3.0.4"
+    npm-package-arg "^8.1.1"
+    pacote "^11.3.0"
     tar "^6.1.0"
 
-libnpmexec@^4.0.2:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.11.tgz#3307fd7b683630268237936a921f5faadd5bfaef"
-  integrity sha512-uhkAWVT0pA1kVgqgTjIMVebOPl3PpIvVcRQ1IBV47ppVxmQr+JCjDahrV0K/0JUsKSVFozyGEEmg1Kz0HwRwzw==
+libnpmexec@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
+  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
   dependencies:
-    "@npmcli/arborist" "^5.0.0"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/fs" "^2.1.1"
-    "@npmcli/run-script" "^4.2.0"
+    "@npmcli/arborist" "^2.3.0"
+    "@npmcli/ci-detect" "^1.3.0"
+    "@npmcli/run-script" "^1.8.4"
     chalk "^4.1.0"
     mkdirp-infer-owner "^2.0.0"
-    npm-package-arg "^9.0.1"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    proc-log "^2.0.0"
+    npm-package-arg "^8.1.2"
+    pacote "^11.3.1"
+    proc-log "^1.0.0"
     read "^1.0.7"
     read-package-json-fast "^2.0.2"
-    semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.2.tgz#7da0827950f0db2cce0acb0dc7652d1834a8b239"
-  integrity sha512-wmFMP/93Wjy+jDg5LaSldDgAhSgCyA64JUUmp806Kae7y3YP9Qv5m1vUhPxT4yebxgB2v/I6G1/RUcNb1y0kVg==
+libnpmfund@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
+  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
   dependencies:
-    "@npmcli/arborist" "^5.0.0"
+    "@npmcli/arborist" "^2.5.0"
 
-libnpmhook@^8.0.2:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.3.tgz#9628518a63455d21dafda312ee46175275707ff5"
-  integrity sha512-TEdNI1mC5zS+w/juCgxrwwQnpbq9lY76NDOS0N37pn6pWIUxB1Yq8mwy6MUEXR1TgH4HurSQyKT6I6Kp9Wjm4A==
+libnpmhook@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30"
+  integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmorg@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.3.tgz#a85cbdb3665ad4f7c7279d239a4581ec2eeef5a6"
-  integrity sha512-r4CpmCEF+e5PbFMBi64xSXmqn0uGgV4T7NWpGL4/A6KT/DTtIxALILQZq+l0ZdN1xm4RjOvqSDR22oT4il8rAQ==
+libnpmorg@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc"
+  integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmpack@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.1.2.tgz#9234a3b1ae433f922c19e97cd3a8a0b135b5f4cc"
-  integrity sha512-megSAPeZGv9jnDM4KovKbczjyuy/EcPxCIU/iaWsDU1IEAVtBJ0qHqNUm5yN2AgN501Tb3CL6KeFGYdG4E31rQ==
+libnpmpack@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
+  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
   dependencies:
-    "@npmcli/run-script" "^4.1.3"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    "@npmcli/run-script" "^1.8.3"
+    npm-package-arg "^8.1.0"
+    pacote "^11.2.6"
 
-libnpmpublish@^6.0.2:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.4.tgz#adb41ec6b0c307d6f603746a4d929dcefb8f1a0b"
-  integrity sha512-lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg==
+libnpmpublish@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
   dependencies:
-    normalize-package-data "^4.0.0"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
-    semver "^7.3.7"
-    ssri "^9.0.0"
+    normalize-package-data "^3.0.2"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
+    semver "^7.1.3"
+    ssri "^8.0.1"
 
-libnpmsearch@^5.0.2:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.3.tgz#ed502a4c2c70ea36723180455fae1357546b2184"
-  integrity sha512-Ofq76qKAPhxbiyzPf/5LPjJln26VTKwU9hIU0ACxQ6tNtBJ1CHmI7iITrdp7vNezhZc0FlkXwrIpqXjhBJZgLQ==
+libnpmsearch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3"
+  integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==
   dependencies:
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmteam@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.3.tgz#9335fbbd032b3770f5c9b7ffc6203f47d1ed144a"
-  integrity sha512-LsYYLz4TlTpcqkusInY5MhKjiHFaCx1GV0LmydXJ/QMh+3IWBJpUhes4ynTZuFoJKkDIFjxyMU09ul+RZixgdg==
+libnpmteam@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c"
+  integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmversion@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.6.tgz#a4a476d38a44d38db9ac424a5e7334479e7fb8b9"
-  integrity sha512-+lI+AO7cZwDxyAeWCIR8+n9XEfgSDAqmNbv4zy+H6onGthsk/+E3aa+5zIeBpyG5g268zjpc0qrBch0Q3w0nBA==
+libnpmversion@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9"
+  integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/run-script" "^4.1.3"
+    "@npmcli/git" "^2.0.7"
+    "@npmcli/run-script" "^1.8.4"
     json-parse-even-better-errors "^2.3.1"
-    proc-log "^2.0.0"
-    semver "^7.3.7"
+    semver "^7.3.5"
+    stringify-package "^1.0.1"
 
 lilconfig@2.0.5:
   version "2.0.5"
@@ -8668,11 +8797,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
-  integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
-
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -8688,29 +8812,7 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.1.5:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
-
-make-fetch-happen@^9.1.0:
+make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
   integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
@@ -8845,7 +8947,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8888,7 +8990,7 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
@@ -8907,7 +9009,7 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^1.3.2:
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
   integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
@@ -8918,17 +9020,6 @@ minipass-fetch@^1.3.2:
   optionalDependencies:
     encoding "^0.1.12"
 
-minipass-fetch@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
-  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
 minipass-flush@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
@@ -8958,14 +9049,14 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
   integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -9100,7 +9191,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.2, negotiator@^0.6.3:
+negotiator@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9157,36 +9248,20 @@ node-gyp-build@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
   integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
 
-node-gyp@^8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
+node-gyp@^7.1.0, node-gyp@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
+    graceful-fs "^4.2.3"
     nopt "^5.0.0"
-    npmlog "^6.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
     rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
-node-gyp@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
-  integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -9235,22 +9310,15 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
-normalize-package-data@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
-  integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
-    hosted-git-info "^5.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -9274,24 +9342,24 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-audit-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
-  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
+npm-audit-report@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
   dependencies:
     chalk "^4.0.0"
 
-npm-bundled@^1.1.1, npm-bundled@^1.1.2:
+npm-bundled@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
-  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
@@ -9300,56 +9368,53 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.0.2, npm-package-arg@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
-  integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
   dependencies:
-    hosted-git-info "^5.0.0"
-    proc-log "^2.0.1"
-    semver "^7.3.5"
-    validate-npm-package-name "^4.0.0"
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
 
-npm-packlist@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
-  integrity sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==
+npm-packlist@^2.1.4:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
-    glob "^8.0.1"
-    ignore-walk "^5.0.1"
-    npm-bundled "^1.1.2"
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@^7.0.0, npm-pick-manifest@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
-  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
   dependencies:
-    npm-install-checks "^5.0.0"
+    npm-install-checks "^4.0.0"
     npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^9.0.0"
-    semver "^7.3.5"
+    npm-package-arg "^8.1.2"
+    semver "^7.3.4"
 
-npm-profile@^6.0.3:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.2.1.tgz#975c31ec75a6ae029ab5b8820ffdcbae3a1e3d5e"
-  integrity sha512-Tlu13duByHyDd4Xy0PgroxzxnBYWbGGL5aZifNp8cx2DxUrHSoETXtPKg38aRPsBWMRfDtvcvVfJNasj7oImQQ==
+npm-profile@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
+  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
   dependencies:
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    npm-registry-fetch "^11.0.0"
 
-npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.1.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
-  integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
+npm-registry-fetch@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
   dependencies:
-    make-fetch-happen "^10.0.6"
-    minipass "^3.1.6"
-    minipass-fetch "^2.0.3"
+    make-fetch-happen "^9.0.1"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^9.0.1"
-    proc-log "^2.0.0"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -9377,90 +9442,98 @@ npm-user-validate@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
 
-npm@8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/npm/-/npm-8.11.0.tgz#224fbca389252e43dd2a277249df3320a7f91189"
-  integrity sha512-4qmtwHa28J4SPmwCNoQI07KIF/ljmBhhuqG+xNXsIIRpwdKB5OXkMIGfH6KlThR6kzusxlkgR7t1haFDB88dcQ==
-  dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
-    "@npmcli/arborist" "^5.0.4"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/config" "^4.1.0"
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/map-workspaces" "^2.0.3"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/run-script" "^3.0.1"
+npm@7.22.0:
+  version "7.22.0"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-7.22.0.tgz#11db1860c68c569eb2e3f4d4e97934b005b585bc"
+  integrity sha512-HJnjTCrGGnacPMCSnrxuHGf2H4VdrY7hwTAK1RwByg0K96KIuTR4QNioFW+bnc/pW0uwpk9lLsDf4BeEQhTv2Q==
+  dependencies:
+    "@npmcli/arborist" "^2.8.3"
+    "@npmcli/ci-detect" "^1.2.0"
+    "@npmcli/config" "^2.3.0"
+    "@npmcli/map-workspaces" "^1.0.4"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.6"
     abbrev "~1.1.1"
+    ansicolors "~0.3.2"
+    ansistyles "~0.1.3"
     archy "~1.0.0"
-    cacache "^16.1.0"
+    cacache "^15.3.0"
     chalk "^4.1.2"
     chownr "^2.0.0"
-    cli-columns "^4.0.0"
-    cli-table3 "^0.6.2"
-    columnify "^1.6.0"
+    cli-columns "^3.1.2"
+    cli-table3 "^0.6.0"
+    columnify "~1.5.4"
     fastest-levenshtein "^1.0.12"
-    glob "^8.0.1"
-    graceful-fs "^4.2.10"
-    hosted-git-info "^5.0.0"
-    ini "^3.0.0"
-    init-package-json "^3.0.2"
+    glob "^7.1.7"
+    graceful-fs "^4.2.8"
+    hosted-git-info "^4.0.2"
+    ini "^2.0.0"
+    init-package-json "^2.0.4"
     is-cidr "^4.0.2"
     json-parse-even-better-errors "^2.3.1"
-    libnpmaccess "^6.0.2"
-    libnpmdiff "^4.0.2"
-    libnpmexec "^4.0.2"
-    libnpmfund "^3.0.1"
-    libnpmhook "^8.0.2"
-    libnpmorg "^4.0.2"
-    libnpmpack "^4.0.2"
-    libnpmpublish "^6.0.2"
-    libnpmsearch "^5.0.2"
-    libnpmteam "^4.0.2"
-    libnpmversion "^3.0.1"
-    make-fetch-happen "^10.1.5"
-    minipass "^3.1.6"
+    libnpmaccess "^4.0.2"
+    libnpmdiff "^2.0.4"
+    libnpmexec "^2.0.1"
+    libnpmfund "^1.1.0"
+    libnpmhook "^6.0.2"
+    libnpmorg "^2.0.2"
+    libnpmpack "^2.0.1"
+    libnpmpublish "^4.0.1"
+    libnpmsearch "^3.1.1"
+    libnpmteam "^2.0.3"
+    libnpmversion "^1.2.1"
+    make-fetch-happen "^9.1.0"
+    minipass "^3.1.3"
     minipass-pipeline "^1.2.4"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
     ms "^2.1.2"
-    node-gyp "^9.0.0"
+    node-gyp "^7.1.2"
     nopt "^5.0.0"
-    npm-audit-report "^3.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.2"
-    npm-pick-manifest "^7.0.1"
-    npm-profile "^6.0.3"
-    npm-registry-fetch "^13.1.1"
+    npm-audit-report "^2.1.5"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.1"
+    npm-profile "^5.0.3"
+    npm-registry-fetch "^11.0.0"
     npm-user-validate "^1.0.1"
-    npmlog "^6.0.2"
+    npmlog "^5.0.1"
     opener "^1.5.2"
-    pacote "^13.4.1"
-    parse-conflict-json "^2.0.2"
-    proc-log "^2.0.1"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
     qrcode-terminal "^0.12.0"
     read "~1.0.7"
-    read-package-json "^5.0.1"
+    read-package-json "^4.1.1"
     read-package-json-fast "^2.0.3"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.7"
-    ssri "^9.0.1"
+    semver "^7.3.5"
+    ssri "^8.0.1"
     tar "^6.1.11"
     text-table "~0.2.0"
     tiny-relative-date "^1.3.0"
-    treeverse "^2.0.0"
-    validate-npm-package-name "^4.0.0"
+    treeverse "^1.0.4"
+    validate-npm-package-name "~3.0.0"
     which "^2.0.2"
-    write-file-atomic "^4.0.1"
+    write-file-atomic "^3.0.3"
 
-npmlog@^6.0.0, npmlog@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
-    are-we-there-yet "^3.0.0"
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
+  dependencies:
+    are-we-there-yet "^2.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.3"
+    gauge "^3.0.0"
     set-blocking "^2.0.0"
 
 nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
@@ -9470,11 +9543,21 @@ nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+
 nwsapi@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
   integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
 
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -9752,32 +9835,30 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@^13.0.3, pacote@^13.4.1, pacote@^13.6.1:
-  version "13.6.2"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
-  integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==
+pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5:
+  version "11.3.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
+  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/promise-spawn" "^3.0.0"
-    "@npmcli/run-script" "^4.1.0"
-    cacache "^16.0.0"
+    "@npmcli/git" "^2.1.0"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.8.2"
+    cacache "^15.0.5"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.6"
-    mkdirp "^1.0.4"
-    npm-package-arg "^9.0.0"
-    npm-packlist "^5.1.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^2.1.4"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^11.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^5.0.0"
-    read-package-json-fast "^2.0.3"
+    read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
+    ssri "^8.0.1"
+    tar "^6.1.0"
 
 pako@~1.0.5:
   version "1.0.11"
@@ -9819,14 +9900,14 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-conflict-json@^2.0.1, parse-conflict-json@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
-  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+parse-conflict-json@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
+  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
   dependencies:
-    json-parse-even-better-errors "^2.3.1"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
+    json-parse-even-better-errors "^2.3.0"
+    just-diff "^3.0.1"
+    just-diff-apply "^3.0.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -9950,6 +10031,11 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -10314,7 +10400,7 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10423,10 +10509,10 @@ private@^0.1.6:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-proc-log@^2.0.0, proc-log@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
-  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+proc-log@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
+  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -10517,7 +10603,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
-psl@^1.1.33:
+psl@^1.1.28, psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -10617,6 +10703,11 @@ qrcode@^1.4.4:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
 query-string@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
@@ -10849,12 +10940,12 @@ react@^17.0.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-cmd-shim@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087"
-  integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==
+read-cmd-shim@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10862,24 +10953,24 @@ read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@^5.0.0, read-package-json@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
-  integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
+read-package-json@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
-    glob "^8.0.1"
-    json-parse-even-better-errors "^2.3.1"
-    normalize-package-data "^4.0.0"
-    npm-normalize-package-bin "^1.0.1"
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
 
-read@1, read@^1.0.7, read@~1.0.7:
+read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   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==
@@ -11122,6 +11213,32 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -11332,7 +11449,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -11423,7 +11540,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
@@ -11444,7 +11561,7 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -11626,15 +11743,6 @@ socks-proxy-agent@^6.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
 socks@^2.6.2:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0"
@@ -11757,6 +11865,21 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
+sshpk@^1.7.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
+
 ssri@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
@@ -11771,13 +11894,6 @@ ssri@^8.0.0, ssri@^8.0.1:
   dependencies:
     minipass "^3.1.1"
 
-ssri@^9.0.0, ssri@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -11848,6 +11964,15 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11857,6 +11982,14 @@ string-length@^4.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -11919,6 +12052,11 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -11926,6 +12064,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -12106,7 +12251,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12302,6 +12447,14 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -12319,10 +12472,10 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
-  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
@@ -12344,11 +12497,23 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -12620,6 +12785,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuidv4@^6.2.13:
   version "6.2.13"
   resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-6.2.13.tgz#8f95ec5ef22d1f92c8e5d4c70b735d1c89572cb7"
@@ -12642,7 +12812,7 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
 
-validate-npm-package-license@^3.0.4:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -12650,18 +12820,27 @@ validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
-  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
   dependencies:
-    builtins "^5.0.0"
+    builtins "^1.0.3"
 
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -12918,7 +13097,7 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.5:
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -12965,7 +13144,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -12975,14 +13154,6 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write-file-atomic@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
 write-file-atomic@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
@@ -13111,7 +13282,7 @@ yarn-audit-fix@^6.3.6:
     fs-extra "^10.0.0"
     globby "^11.0.4"
     lodash "^4.17.21"
-    npm "8.11.0"
+    npm "7.22.0"
     pkg-dir "^5.0.0"
     semver "^7.3.5"
     synp "^1.9.7"

From 4a0b83709ca8e584f0846c7c7567bd577e878e94 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 31 Aug 2022 13:54:04 -0300
Subject: [PATCH 007/132] now the buttons looks like the design

---
 .../Tokens/components/TokenSelector/index.jsx | 45 +++++++++--------
 .../Tokens/components/TokenSelector/styles.js | 50 +++++--------------
 source/components/Tokens/index.jsx            |  3 --
 3 files changed, 36 insertions(+), 62 deletions(-)

diff --git a/source/components/Tokens/components/TokenSelector/index.jsx b/source/components/Tokens/components/TokenSelector/index.jsx
index 2bcad841..0f2bf784 100644
--- a/source/components/Tokens/components/TokenSelector/index.jsx
+++ b/source/components/Tokens/components/TokenSelector/index.jsx
@@ -1,35 +1,36 @@
 import React from 'react';
 import coins from '@assets/icons/coins.svg';
 import imageIcon from '@assets/icons/imageIcon.svg';
+import { useRouter } from '@components/Router';
+import { Typography } from '@material-ui/core';
 import useStyles from './styles';
 
 // eslint-disable-next-line react/prop-types
 const TokenSelector = ({ onClose }) => {
   const classes = useStyles();
+  const { navigator } = useRouter();
   return (
     <>
-      <div>
-        <div
-          onClick={() => navigator.navigate('add-token')}
-          className={classes.addTokenButton}
-          data-testid="add-custom-token-button"
-        >
-          <img
-            src={coins}
-            alt="reload"
-          />  Add Token
-        </div>
-        <div
-          onClick={() => navigator.navigate('add-nft')}
-          className={classes.addNftButton}
-          data-testid="add-custom-token-button"
-        >
-          <img
-            src={imageIcon}
-            alt="reload"
-          />
-          Add NFT
-        </div>
+      <div
+        onClick={() => navigator.navigate('add-token')}
+        className={classes.addTokenButton}
+        data-testid="add-custom-token-button"
+      >
+        <img
+          src={coins}
+          alt="reload"
+        />  <Typography variant="h5" data-testid="wallet-name">Add Token</Typography>
+      </div>
+      <div
+        onClick={() => navigator.navigate('add-nft')}
+        className={classes.addNftButton}
+        data-testid="add-custom-token-button"
+      >
+        <img
+          src={imageIcon}
+          alt="reload"
+        />
+        <Typography variant="h5" data-testid="wallet-name">Add NFT</Typography>
       </div>
       <div className={classes.background} onClick={onClose} />
     </>
diff --git a/source/components/Tokens/components/TokenSelector/styles.js b/source/components/Tokens/components/TokenSelector/styles.js
index 24a82745..c7dc1d4e 100644
--- a/source/components/Tokens/components/TokenSelector/styles.js
+++ b/source/components/Tokens/components/TokenSelector/styles.js
@@ -1,4 +1,5 @@
 import { makeStyles } from '@material-ui/core/styles';
+import SHADOW_1 from '@shared/styles/shadows';
 
 export default makeStyles(() => ({
   addTokenButton: {
@@ -10,14 +11,13 @@ export default makeStyles(() => ({
     position: 'absolute',
     borderRadius: 42,
     height: 42,
-    paddingLeft: 8,
-    paddingRight: 8,
-    backgroundColor: '#FFFFF',
+    paddingLeft: 12,
+    paddingRight: 12,
+    backgroundColor: '#FFFF',
     cursor: 'pointer',
-    border: 2,
-    borderStyle: 'solid',
-    borderColor: '#A0A3A9',
-    gap: 4,
+    gap: 8,
+    zIndex: 10,
+    boxShadow: SHADOW_1,
   },
   addNftButton: {
     display: 'flex',
@@ -29,12 +29,13 @@ export default makeStyles(() => ({
     borderRadius: 42,
     height: 42,
     padding: 5,
-    backgroundColor: '#FFFFF',
-    border: 2,
-    borderStyle: 'solid',
-    borderColor: '#A0A3A9',
+    backgroundColor: '#FFFF',
     cursor: 'pointer',
-    gap: 4,
+    gap: 8,
+    zIndex: 10,
+    boxShadow: SHADOW_1,
+    paddingLeft: 12,
+    paddingRight: 12,
   },
   background: {
     width: '100%',
@@ -44,29 +45,4 @@ export default makeStyles(() => ({
     top: 0,
     right: 0,
   },
-  selectorContainer: {
-    display: 'flex',
-    flexDirection: 'column',
-    width: 250,
-    padding: '20px 20px 0 20px',
-    position: 'absolute',
-    top: 50,
-    right: 10,
-    background: '#FFFFFF',
-    borderRadius: 6,
-    // boxShadow: SHADOW_1,
-    zIndex: 10000,
-  },
-  selectorHeader: {
-    display: 'flex',
-    justifyContent: 'space-between',
-    alignItems: 'center',
-  },
-  networksContainer: {
-    display: 'flex',
-    flexDirection: 'column',
-    zIndex: 10,
-    maxHeight: 330,
-    overflow: 'auto',
-  },
 }));
diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index 63999d5b..2a788130 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -5,8 +5,6 @@ import { setAssets, setAssetsLoading } from '@redux/wallet';
 import clsx from 'clsx';
 
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-// import { useRouter } from '@components/Router';
-
 import { useICPPrice } from '@redux/icp';
 import { setICNSData } from '@redux/icns';
 import { useScroll } from '@hooks';
@@ -21,7 +19,6 @@ const Tokens = () => {
   const [loading, setLoading] = useState(true);
   const dispatch = useDispatch();
   const icpPrice = useICPPrice();
-  // const { navigator } = useRouter();
   const { onScroll, fullScroll } = useScroll();
   const [activateButton, setActivateButton] = useState(false);
 

From 01560e4d776a279bbaf52dcb84129bc8acaab71d Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 31 Aug 2022 22:03:24 -0300
Subject: [PATCH 008/132] removed standards to DIP721v2 only - display token
 info in step2

---
 package.json                                  |  2 +-
 source/Background/Keyring/index.js            |  3 +-
 .../Extension/Views/AddNFT/Steps/Step2.jsx    | 59 ++++++-------------
 .../Views/AddNFT/components/CustomNFT.jsx     |  7 ++-
 yarn.lock                                     | 12 ++--
 5 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 4bdd6a40..c675444e 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/dab-js-test": "1.4.7",
+    "@psychedelic/dab-js-test": "1.4.11",
     "@psychedelic/plug-controller": "/Users/cancu/Dev/plug-controller",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index a5bfa0a1..d8923269 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -288,8 +288,7 @@ export const getKeyringHandler = (type, keyring) => ({
           canisterId,
           standard,
         });
-        console.log(nftInfo);
-        return { nftInfo };
+        return nftInfo;
       } catch (e) {
         // eslint-disable-next-line
         console.log('Error while fetching NFT info', e);
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
index e485fa01..c60aa188 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -16,49 +16,31 @@ import { useDispatch } from 'react-redux';
 
 import useStyles from '../styles';
 
-const cyclesToTC = cycles => cycles ? cycles / CYCLES_PER_TC : 0; // eslint-disable-line
-
-const parseTokenBySymbol = (token) => ({
-  XTC: {
-    ...token?.token,
-    amount: cyclesToTC(token.amount),
-    logo: XTCIcon,
-    price: cyclesToTC(token.amount) * USD_PER_TC,
-  },
-  WTC: {
-    ...token?.token,
-    amount: cyclesToTC(token.amount),
-    price: cyclesToTC(token.amount) * USD_PER_TC,
-  },
-})[token?.token?.symbol] || {
-  ...token?.token,
-  amount: token?.amount?.value / (10 ** token?.amount?.decimals),
-};
 
 const Step2 = ({ selectedToken, handleClose }) => {
   const { t } = useTranslation();
   const classes = useStyles();
   const dispatch = useDispatch();
   const [loading, setLoading] = useState(false);
-  const displayToken = parseTokenBySymbol(selectedToken);
+  // const displayToken = parseTokenBySymbol(selectedToken); // podemos agregar un parser para terminar con el ultimo objeto
   const icpPrice = useICPPrice();
 
   const registerToken = () => {
     setLoading(true);
-    sendMessage({
-      type: HANDLER_TYPES.ADD_CUSTOM_TOKEN,
-      params: selectedToken?.token,
-    }, async () => {
-      sendMessage({
-        type: HANDLER_TYPES.GET_ASSETS,
-        params: { refresh: true },
-      }, (keyringAssets) => {
-        dispatch(setAssets({ keyringAssets, icpPrice }));
-        dispatch(setAssetsLoading(false));
-        setLoading(false);
-        handleClose();
-      });
-    });
+    // sendMessage({
+    //   type: HANDLER_TYPES.ADD_CUSTOM_TOKEN,
+    //   params: selectedToken?.token,
+    // }, async () => {
+    //   sendMessage({
+    //     type: HANDLER_TYPES.GET_ASSETS,
+    //     params: { refresh: true },
+    //   }, (keyringAssets) => {
+    //     dispatch(setAssets({ keyringAssets, icpPrice }));
+    //     dispatch(setAssetsLoading(false));
+    //     setLoading(false);
+    //     handleClose();
+    //   });
+    // });
   };
 
   return (
@@ -70,19 +52,12 @@ const Step2 = ({ selectedToken, handleClose }) => {
         <Grid item xs={12}>
           <div className={classes.confirmToken}>
             <TokenIcon
-              logo={displayToken.logo}
+              logo={selectedToken.logo}
               className={classes.tokenImage}
-              symbol={displayToken?.symbol}
             />
             <div className={classes.leftContainer}>
-              <Typography variant="h4">{displayToken.name}</Typography>
-              <Typography variant="subtitle1"><AssetFormat value={displayToken?.amount} asset={displayToken?.symbol} /></Typography>
+              <Typography variant="h4">{selectedToken.name}</Typography>
             </div>
-            {!!displayToken.price && (
-              <div className={classes.rightContainer}>
-                <Typography variant="h4"><USDFormat value={displayToken?.price} /></Typography>
-              </div>
-            )}
           </div>
         </Grid>
         <Grid item xs={12}>
diff --git a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
index 10c0375e..0e9cdb74 100644
--- a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
+++ b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
@@ -17,12 +17,12 @@ import extension from 'extensionizer';
 import { customTokensUrl } from '@shared/constants/urls';
 import useStyles from '../styles';
 
-const FUNGIBLE_STANDARDS = { DIP721: 'DIP721', EXT: 'EXT', DIP721v2: 'DIP721 v2', };
+const FUNGIBLE_STANDARDS = { DIP721v2: 'DIP721v2', };
 
 const CustomNFT = ({ handleChangeSelectedNFT }) => {
   const { t } = useTranslation();
   const [canisterId, setCanisterId] = useState('');
-  const [standard, setStandard] = useState(FUNGIBLE_STANDARDS.DIP721);
+  const [standard, setStandard] = useState(FUNGIBLE_STANDARDS.DIP721v2);
   const [invalidToken, setInvalidToken] = useState(null);
   const [tokenError, setTokenError] = useState('');
   const [loading, setLoading] = useState(false);
@@ -52,7 +52,8 @@ const CustomNFT = ({ handleChangeSelectedNFT }) => {
           console.log('ocrrio un error al devolver la info', nftInfo);
           setTokenError(nftInfo?.error);
         } else {
-          handleChangeSelectedNFT(tokenInfo)();
+          console.log('cheee llega la data', nftInfo);
+          handleChangeSelectedNFT(nftInfo)();
         }
         setLoading(false);
       },
diff --git a/yarn.lock b/yarn.lock
index 8f3527f1..603a8e40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1761,10 +1761,10 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js-test@1.4.7":
-  version "1.4.7"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js-test/1.4.7/2c0de3b66de07f9410c8edc8fc799a9b22236d5d#2c0de3b66de07f9410c8edc8fc799a9b22236d5d"
-  integrity sha512-+zc5O0gbPFno0ljh+9+XwvEYf30VCswluPAnatmB6xVmR6eQIZw2DqbLclTDRhNQIE+hP/pjUwXsqDWINjhOhA==
+"@psychedelic/dab-js-test@1.4.11":
+  version "1.4.11"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js-test/1.4.11/e46210c7148fe9acfdf7192af3406d17ee87cd31#e46210c7148fe9acfdf7192af3406d17ee87cd31"
+  integrity sha512-6hi8AKA+VKN476Eo9UOV6hwhKdpLAmqe3P646ry9vJM/k9AY6+iHVDbpSOelW6IStDACDbsCugVjYSck0ojBgQ==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1797,7 +1797,7 @@
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js-test" "1.4.7"
+    "@psychedelic/dab-js-test" "1.4.11"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"
@@ -1828,7 +1828,7 @@
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js-test" "1.4.7"
+    "@psychedelic/dab-js-test" "1.4.11"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"

From b1846d8255b953da192262ecd5206ad12e8e90a1 Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Thu, 1 Sep 2022 16:28:14 +0200
Subject: [PATCH 009/132] feat: test ids added/first test added and passed

---
 .../components/NetworkSelector/index.jsx      |  2 +-
 .../Network/components/NoNetworks/index.jsx   |  2 +-
 .../Extension/Views/NetworkCreation/index.jsx |  2 +
 tests/e2e/add-network.test.js                 | 58 -------------------
 tests/e2e/network.test.js                     | 49 ++++++++++++++++
 5 files changed, 53 insertions(+), 60 deletions(-)
 delete mode 100644 tests/e2e/add-network.test.js
 create mode 100644 tests/e2e/network.test.js

diff --git a/source/components/ConnectionStatus/components/NetworkSelector/index.jsx b/source/components/ConnectionStatus/components/NetworkSelector/index.jsx
index 7460783c..3d7ef096 100644
--- a/source/components/ConnectionStatus/components/NetworkSelector/index.jsx
+++ b/source/components/ConnectionStatus/components/NetworkSelector/index.jsx
@@ -21,7 +21,7 @@ const NetworkSelector = ({ onClose, refreshWallet }) => {
   };
   return (
     <>
-      <div className={classes.selectorContainer}>
+      <div className={classes.selectorContainer} data-testid="network-selection-modal">
         <div className={classes.selectorHeader}>
           <Typography variant="h4">Networks</Typography>
           <Button
diff --git a/source/views/Extension/Views/Network/components/NoNetworks/index.jsx b/source/views/Extension/Views/Network/components/NoNetworks/index.jsx
index 1ff59a9f..5ad181f9 100644
--- a/source/views/Extension/Views/Network/components/NoNetworks/index.jsx
+++ b/source/views/Extension/Views/Network/components/NoNetworks/index.jsx
@@ -18,7 +18,7 @@ const NoNetworks = () => {
   return (
     <div className={classes.noNetworksContainer}>
       <img src={AntennaIcon} alt="network" className={classes.networkIcon} />
-      <Typography variant="h3">{t('network.addNetwork')}</Typography>
+      <Typography  variant="h3">{t('network.addNetwork')}</Typography>
       <Typography variant="subtitle2">{t('network.addNetworkDescription')}</Typography>
       <Button variant="rainbow" value={t('network.addNetwork')} onClick={goToCreateNetwork} fullWidth />
     </div>
diff --git a/source/views/Extension/Views/NetworkCreation/index.jsx b/source/views/Extension/Views/NetworkCreation/index.jsx
index 1e5af9d1..6fc1db56 100644
--- a/source/views/Extension/Views/NetworkCreation/index.jsx
+++ b/source/views/Extension/Views/NetworkCreation/index.jsx
@@ -77,6 +77,7 @@ const NetworkCreation = () => {
                 onChange={handleFieldChange(field.name)}
                 placeholder={t(`network.${field.name}Placeholder`)}
                 error={errors[field.name]}
+                data-testid={`network-input-${field.name}`}
               />
               {errors[field.name] && <Typography variant="body2" color="error">{errors[field.name]}</Typography>}
             </div>
@@ -88,6 +89,7 @@ const NetworkCreation = () => {
           value={t('network.addNetwork')}
           loading={networksLoading}
           disabled={networksLoading || !validateNetwork(values, networks)}
+          data-testid="add-network-button"
           fullWidth
         />
       </div>
diff --git a/tests/e2e/add-network.test.js b/tests/e2e/add-network.test.js
deleted file mode 100644
index 4a8fd24b..00000000
--- a/tests/e2e/add-network.test.js
+++ /dev/null
@@ -1,58 +0,0 @@
-const depositViewButtonClick = async (page) => {
-  const depositViewButton = await page.getByTestId('open-deposit-view-button', true);
-  await depositViewButton.click();
-};
-
-const checkIsCopyButtonTextMatch = async (page, name, id) => {
-  const copyButton = await page.getByTestId(`copy-${name}-button`, true);
-  await copyButton.click();
-  const copiedText = await page.evaluate(() => navigator.clipboard.readText());
-  expect(copiedText).toBe(id);
-};
-
-const qrCodeIconButtonClick = async (page) => {
-  const qrCodeIconButton = await page.getByTestId('qr-code-icon-button', true);
-  await qrCodeIconButton.click();
-};
-
-const closeQrCodeModalButtonClick = async (page) => {
-  const qrCodeIconButton = await page.getByTestId('close-qr-code-modal-button', true);
-  await qrCodeIconButton.click();
-};
-
-const checkIsSubtitleTextMatch = async (page, name, text) => {
-  const subtitle = await page.getByTestId(`deposit-${name}-subtitle`, true);
-  const subtitleText = await page.evaluate((el) => el.textContent, subtitle);
-  expect(subtitleText).toBe(text);
-};
-
-describe('Add Network View', () => {
-  let browser;
-  let page;
-
-  beforeAll(async () => {
-    browser = await setupChrome();
-
-    // Importing and unlocking the accoun
-    page = await utils.createNewPage(browser);
-
-    await optionsPageUtils.importAccount(page, secrets.seedphrase, secrets.password);
-    await optionsPageUtils.unlock(page, secrets.password);
-    await depositViewButtonClick(page);
-  });
-
-  afterAll(async () => {
-    await browser.close();
-  });
-
-  test('deposit view content is rendered correctly', async () => {
-    await checkIsSubtitleTextMatch(page, principalId, principalIdSubtitle);
-    await checkIsSubtitleTextMatch(page, accountId, accountIdSubtitle);
-
-    await checkIsCopyButtonTextMatch(page, principalId, secrets.mainPrincipalId);
-    await checkIsCopyButtonTextMatch(page, accountId, secrets.mainAccountId);
-
-    await qrCodeIconButtonClick(page);
-    await closeQrCodeModalButtonClick(page);
-  });
-});
diff --git a/tests/e2e/network.test.js b/tests/e2e/network.test.js
new file mode 100644
index 00000000..35ce0bbf
--- /dev/null
+++ b/tests/e2e/network.test.js
@@ -0,0 +1,49 @@
+const openSelectNetworkModalButtonClick = async (page, boolean) => {
+  const openSelectNetworkModalButton = await page.getByTestId('network-selector', true);
+  await openSelectNetworkModalButton.click();
+  await page.waitForTestIdSelector('network-selection-modal', { hidden: boolean });
+};
+
+const selectNetworkCardClick = async (page, name) => {
+  const selectNetworkButton = await page.getByTestId(`network-card-${name}`, true);
+  await selectNetworkButton.click();
+};
+
+describe('Network', () => {
+  let browser;
+  let page;
+
+  const networkName = 'Sonic';
+  const hostURL = 'https://testnet.sonic.ooo:8420/';
+  const ledgerCanisterID = 'rrkah-fqaaa-aaaaa-aaaaq-cai';
+
+  beforeAll(async () => {
+    browser = await setupChrome();
+
+    // Importing and unlocking the account
+    page = await utils.createNewPage(browser);
+
+    await optionsPageUtils.importAccount(page, secrets.seedphrase, secrets.password);
+    await optionsPageUtils.unlock(page, secrets.password);
+
+    await page.close();
+  });
+
+  beforeEach(async () => {
+    page = await utils.createNewPage(browser);
+    await page.goto(chromeData.popupUrl);
+  });
+
+  afterEach(async () => {
+    await page.close();
+  });
+
+  afterAll(async () => {
+    await browser.close();
+  });
+
+  test('checking that clicking on Network Select button opens and close the network modal', async () => {
+    await openSelectNetworkModalButtonClick(page, false);
+    await openSelectNetworkModalButtonClick(page, true);
+  });
+});

From 30f74c12a58f51cfcaeeefea520fe06fe6c49226 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Thu, 1 Sep 2022 18:44:41 -0300
Subject: [PATCH 010/132] added add-custom-nft function

---
 source/Background/Keyring/index.js            | 15 ++++++++++++++
 .../Extension/Views/AddNFT/Steps/Step2.jsx    | 20 ++++++-------------
 .../Views/AddNFT/components/CustomNFT.jsx     |  2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index d8923269..a17a054d 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -89,6 +89,7 @@ export const HANDLER_TYPES = {
   GET_TOKEN_INFO: 'get-token-info',
   GET_NFT_INFO: 'get-nft-info',
   ADD_CUSTOM_TOKEN: 'add-custom-token',
+  ADD_CUSTOM_NFT: 'add-custom-nft',
   CREATE_PRINCIPAL: 'create-principal',
   SET_CURRENT_PRINCIPAL: 'set-current-principal',
   GET_PEM_FILE: 'get-pem-file',
@@ -124,6 +125,7 @@ export const getKeyringErrorMessage = (type) => ({
   [HANDLER_TYPES.GET_TOKEN_INFO]: 'fetching token info.',
   [HANDLER_TYPES.GET_NFT_INFO]: 'fetching nft info.',
   [HANDLER_TYPES.ADD_CUSTOM_TOKEN]: 'adding custom token.',
+  [HANDLER_TYPES.ADD_CUSTOM_NFT]: 'adding custom nft.',
   [HANDLER_TYPES.CREATE_PRINCIPAL]: 'creating your principal.',
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]: 'setting your principal.',
   [HANDLER_TYPES.GET_PEM_FILE]: 'getting your PEM file.',
@@ -295,6 +297,19 @@ export const getKeyringHandler = (type, keyring) => ({
         return { error: e.message };
       }
     },
+  [HANDLER_TYPES.ADD_CUSTOM_NFT]:
+    async ({ canisterId, standard }) => {
+      try {
+        const nfts = await keyring.registerNFT({
+          canisterId, standard,
+        });
+        return (nfts || []).map((nft) => recursiveParseBigint(nft));
+      } catch (e) {
+        // eslint-disable-next-line
+        console.log('Error registering nft', e);
+        return { error: e.message };
+      }
+    },
   [HANDLER_TYPES.ADD_CUSTOM_TOKEN]:
     async ({ canisterId, standard, logo }) => {
       try {
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
index c60aa188..64122c97 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -27,20 +27,12 @@ const Step2 = ({ selectedToken, handleClose }) => {
 
   const registerToken = () => {
     setLoading(true);
-    // sendMessage({
-    //   type: HANDLER_TYPES.ADD_CUSTOM_TOKEN,
-    //   params: selectedToken?.token,
-    // }, async () => {
-    //   sendMessage({
-    //     type: HANDLER_TYPES.GET_ASSETS,
-    //     params: { refresh: true },
-    //   }, (keyringAssets) => {
-    //     dispatch(setAssets({ keyringAssets, icpPrice }));
-    //     dispatch(setAssetsLoading(false));
-    //     setLoading(false);
-    //     handleClose();
-    //   });
-    // });
+    console.log('el selected token es ->', selectedToken);
+    sendMessage({
+      type: HANDLER_TYPES.ADD_CUSTOM_NFT,
+      params: selectedToken,
+    });
+    console.log('salio todo correcto')
   };
 
   return (
diff --git a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
index 0e9cdb74..e7527462 100644
--- a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
+++ b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
@@ -49,7 +49,7 @@ const CustomNFT = ({ handleChangeSelectedNFT }) => {
       },
       async (nftInfo) => {
         if (nftInfo?.error) {
-          console.log('ocrrio un error al devolver la info', nftInfo);
+          console.log('ocurrio un error al devolver la info', nftInfo);
           setTokenError(nftInfo?.error);
         } else {
           console.log('cheee llega la data', nftInfo);

From 941e321f173b045fa81567bea313909edff5ddc0 Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Sun, 4 Sep 2022 17:01:14 +0200
Subject: [PATCH 011/132] feat: all tests added and passed

---
 .../components/ConnectionControls/index.jsx   |  2 +-
 .../Extension/Views/NetworkCreation/index.jsx |  6 +-
 tests/e2e/network.test.js                     | 94 ++++++++++++++++++-
 3 files changed, 95 insertions(+), 7 deletions(-)

diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index 6c60920b..f045a0f8 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -146,7 +146,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
             )}
           >
             <div className={clsx(classes.statusDot)} />
-            <span className={classes.network}>
+            <span className={classes.network} data-testid="current-network-name">
               {capitalize(currentNetwork?.name || 'Mainnet')}
             </span>
           </div>
diff --git a/source/views/Extension/Views/NetworkCreation/index.jsx b/source/views/Extension/Views/NetworkCreation/index.jsx
index 6fc1db56..3c3c8df4 100644
--- a/source/views/Extension/Views/NetworkCreation/index.jsx
+++ b/source/views/Extension/Views/NetworkCreation/index.jsx
@@ -60,8 +60,8 @@ const NetworkCreation = () => {
     <Layout>
       <Header
         center={<Typography variant="h2">{t('network.addNetwork')}</Typography>}
-        left={<LinkButton value={t('common.back')} onClick={navigator.goBack} startIcon={BackIcon} />}
-        right={<LinkButton value={t('common.close')} onClick={() => navigator.navigate('home')} />}
+        left={<LinkButton value={t('common.back')} onClick={navigator.goBack} startIcon={BackIcon} data-testid="back-button" />}
+        right={<LinkButton value={t('common.close')} onClick={() => navigator.navigate('home')} data-testid="close-button"/>}
       />
       <div className={classes.networkCreationContainer}>
         <div className={classes.networksContainer}>
@@ -79,7 +79,7 @@ const NetworkCreation = () => {
                 error={errors[field.name]}
                 data-testid={`network-input-${field.name}`}
               />
-              {errors[field.name] && <Typography variant="body2" color="error">{errors[field.name]}</Typography>}
+              {errors[field.name] && <Typography variant="body2" data-testid={`network-error-${field.name}`} color="error">{errors[field.name]}</Typography>}
             </div>
           ))}
         </div>
diff --git a/tests/e2e/network.test.js b/tests/e2e/network.test.js
index 35ce0bbf..8832767a 100644
--- a/tests/e2e/network.test.js
+++ b/tests/e2e/network.test.js
@@ -9,18 +9,70 @@ const selectNetworkCardClick = async (page, name) => {
   await selectNetworkButton.click();
 };
 
+const addNetworkButtonClick = async (page) => {
+  const addNetworkButton = await page.getByTestId('add-network-button', true);
+  await addNetworkButton.click();
+};
+
+const exitButtonClick = async (page, button) => {
+  const addNetworkButton = await page.getByTestId(button, true);
+  await addNetworkButton.click();
+};
+
+const inputFill = async (page, testId, value) => {
+  const input = await page.getByTestId(testId, true);
+  await input.click();
+  await input.type(value);
+};
+
+const isErrorMatch = async (page, testId, error) => {
+  const inputErrorLabel = await page.getByTestId(testId, true);
+  const errorMessage = await page.evaluate((el) => el.textContent, inputErrorLabel);
+  expect(errorMessage).toBe(error);
+};
+
+const isCurrentNetworkMatch = async (page, network) => {
+  const inputErrorLabel = await page.getByTestId('current-network-name', true);
+  const currentNetworkName = await page.evaluate((el) => el.textContent, inputErrorLabel);
+  expect(currentNetworkName).toBe(network);
+};
+
 describe('Network', () => {
   let browser;
   let page;
 
   const networkName = 'Sonic';
-  const hostURL = 'https://testnet.sonic.ooo:8420/';
-  const ledgerCanisterID = 'rrkah-fqaaa-aaaaa-aaaaq-cai';
+
+  const exitButtonData = ['back-button', 'close-button'];
+
+  const networkInputNameTestID = 'network-input-name';
+  const networkInputHostTestID = 'network-input-host';
+  const networkInputCanisterIDTestID = 'network-input-ledgerCanisterId';
+
+  const networkInputNameErrorTestID = 'network-error-name';
+  const networkInputHostErrorTestID = 'network-error-host';
+  const networkInputCanisterIDErrorTestID = 'network-error-ledgerCanisterId';
+
+  const wrongNetworkData = [
+    { testId: networkInputHostTestID, value: 'kkk.fff' },
+    { testId: networkInputCanisterIDTestID, value: 'jjj-ijuij-jji-ddd' },
+  ];
+
+  const correctNetworkData = [
+    { testId: networkInputNameTestID, value: networkName },
+    { testId: networkInputHostTestID, value: 'https://testnet.sonic.ooo:8420/' },
+    { testId: networkInputCanisterIDTestID, value: 'rrkah-fqaaa-aaaaa-aaaaq-cai' },
+  ];
+
+  const inputsErrorsData = [
+    { testId: networkInputNameErrorTestID, errorMessage: 'Required' },
+    { testId: networkInputHostErrorTestID, errorMessage: 'Invalid URL' },
+    { testId: networkInputCanisterIDErrorTestID, errorMessage: 'Invalid canister ID' },
+  ];
 
   beforeAll(async () => {
     browser = await setupChrome();
 
-    // Importing and unlocking the account
     page = await utils.createNewPage(browser);
 
     await optionsPageUtils.importAccount(page, secrets.seedphrase, secrets.password);
@@ -46,4 +98,40 @@ describe('Network', () => {
     await openSelectNetworkModalButtonClick(page, false);
     await openSelectNetworkModalButtonClick(page, true);
   });
+
+  test('checking that the Back and Close button sends a user from the Add Network flow to the Main flow', async () => {
+    for (const data of exitButtonData) {
+      await openSelectNetworkModalButtonClick(page, false);
+      await addNetworkButtonClick(page);
+      await exitButtonClick(page, data);
+      await page.waitForTestIdSelector('open-deposit-view-button', { hidden: false });
+    }
+  });
+
+  test('checking inputs validation on Add Network flow', async () => {
+    await openSelectNetworkModalButtonClick(page, false);
+    await addNetworkButtonClick(page);
+    for (const data of wrongNetworkData) {
+      await inputFill(page, data.testId, data.value);
+    }
+    await addNetworkButtonClick(page);
+    for (const data of inputsErrorsData) {
+      await isErrorMatch(page, data.testId, data.errorMessage);
+    }
+  });
+
+  test('adding a new network and switching on it', async () => {
+    await openSelectNetworkModalButtonClick(page, false);
+    await addNetworkButtonClick(page);
+    for (const data of correctNetworkData) {
+      await inputFill(page, data.testId, data.value);
+    }
+    await addNetworkButtonClick(page);
+    await openSelectNetworkModalButtonClick(page, false);
+    await selectNetworkCardClick(page, networkName);
+    await page.waitForTestIdSelector('network-selection-modal', { hidden: true });
+    await page.waitForSelector('[data-testid="tab-item-NFTs"][disabled]');
+    await isCurrentNetworkMatch(page, networkName);
+    await page.waitForTestIdSelector('asset-name-XTC', { hidden: true });
+  });
 });

From d56c1aa34029e4eedffdab5cd691f3589015ee4f Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Sun, 4 Sep 2022 17:31:19 +0200
Subject: [PATCH 012/132] fix: variables changes

---
 tests/e2e/network.test.js | 10 +++++-----
 tests/setup/jestSetup.js  |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/network.test.js b/tests/e2e/network.test.js
index 8832767a..4bb01ad0 100644
--- a/tests/e2e/network.test.js
+++ b/tests/e2e/network.test.js
@@ -54,14 +54,14 @@ describe('Network', () => {
   const networkInputCanisterIDErrorTestID = 'network-error-ledgerCanisterId';
 
   const wrongNetworkData = [
-    { testId: networkInputHostTestID, value: 'kkk.fff' },
-    { testId: networkInputCanisterIDTestID, value: 'jjj-ijuij-jji-ddd' },
+    { testId: networkInputHostTestID, value: secrets.wrongHostName },
+    { testId: networkInputCanisterIDTestID, value: secrets.wrongCanisterId },
   ];
 
   const correctNetworkData = [
-    { testId: networkInputNameTestID, value: networkName },
-    { testId: networkInputHostTestID, value: 'https://testnet.sonic.ooo:8420/' },
-    { testId: networkInputCanisterIDTestID, value: 'rrkah-fqaaa-aaaaa-aaaaq-cai' },
+    { testId: networkInputNameTestID, value: secrets.networkName },
+    { testId: networkInputHostTestID, value: secrets.hostName },
+    { testId: networkInputCanisterIDTestID, value: secrets.canisterID },
   ];
 
   const inputsErrorsData = [
diff --git a/tests/setup/jestSetup.js b/tests/setup/jestSetup.js
index 57ea6248..dc00c486 100644
--- a/tests/setup/jestSetup.js
+++ b/tests/setup/jestSetup.js
@@ -20,6 +20,10 @@ global.secrets = {
   wrongCanisterId: process.env.WRONG_CANISTER_ID,
   wrongId: process.env.WRONG_ID,
   wrongICNSName: process.env.WRONG_ICNS_NAME,
+  networkName: process.env.NETWORK_NAME,
+  hostName: process.env.HOST_NAME,
+  canisterID: process.env.CANISTER_ID,
+  wrongHostName: process.env.WRONG_HOST_NAME,
 };
 
 const grantRawPermissions = async (context, url, permissions) => {

From d7c4a5929529d0330a03df9e87cc22ff045e5424 Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Sun, 4 Sep 2022 18:15:03 +0200
Subject: [PATCH 013/132] feat: extra case added

---
 tests/e2e/network.test.js | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/network.test.js b/tests/e2e/network.test.js
index 4bb01ad0..945f2106 100644
--- a/tests/e2e/network.test.js
+++ b/tests/e2e/network.test.js
@@ -70,6 +70,11 @@ describe('Network', () => {
     { testId: networkInputCanisterIDErrorTestID, errorMessage: 'Invalid canister ID' },
   ];
 
+  const inputsErrorsData2 = [
+    { testId: networkInputNameErrorTestID, errorMessage: 'There is already a network with that name' },
+    { testId: networkInputHostErrorTestID, errorMessage: 'There is already a network with that host' },
+  ];
+
   beforeAll(async () => {
     browser = await setupChrome();
 
@@ -84,6 +89,7 @@ describe('Network', () => {
   beforeEach(async () => {
     page = await utils.createNewPage(browser);
     await page.goto(chromeData.popupUrl);
+    await openSelectNetworkModalButtonClick(page, false);
   });
 
   afterEach(async () => {
@@ -95,21 +101,19 @@ describe('Network', () => {
   });
 
   test('checking that clicking on Network Select button opens and close the network modal', async () => {
-    await openSelectNetworkModalButtonClick(page, false);
     await openSelectNetworkModalButtonClick(page, true);
   });
 
   test('checking that the Back and Close button sends a user from the Add Network flow to the Main flow', async () => {
     for (const data of exitButtonData) {
-      await openSelectNetworkModalButtonClick(page, false);
       await addNetworkButtonClick(page);
       await exitButtonClick(page, data);
       await page.waitForTestIdSelector('open-deposit-view-button', { hidden: false });
+      await openSelectNetworkModalButtonClick(page, false);
     }
   });
 
   test('checking inputs validation on Add Network flow', async () => {
-    await openSelectNetworkModalButtonClick(page, false);
     await addNetworkButtonClick(page);
     for (const data of wrongNetworkData) {
       await inputFill(page, data.testId, data.value);
@@ -120,8 +124,7 @@ describe('Network', () => {
     }
   });
 
-  test('adding a new network and switching on it', async () => {
-    await openSelectNetworkModalButtonClick(page, false);
+  test('adding a new network and switching on it/checking that the extension does not allow to add an existing network', async () => {
     await addNetworkButtonClick(page);
     for (const data of correctNetworkData) {
       await inputFill(page, data.testId, data.value);
@@ -133,5 +136,16 @@ describe('Network', () => {
     await page.waitForSelector('[data-testid="tab-item-NFTs"][disabled]');
     await isCurrentNetworkMatch(page, networkName);
     await page.waitForTestIdSelector('asset-name-XTC', { hidden: true });
+
+    // checking that the extension does not allow to add an existing network
+    await openSelectNetworkModalButtonClick(page, false);
+    await addNetworkButtonClick(page);
+    for (const data of correctNetworkData) {
+      await inputFill(page, data.testId, data.value);
+    }
+    await addNetworkButtonClick(page);
+    for (const data of inputsErrorsData2) {
+      await isErrorMatch(page, data.testId, data.errorMessage);
+    }
   });
 });

From 401b4c60790262dba9166bbb622e6c7f6500406a Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Mon, 5 Sep 2022 16:49:11 +0200
Subject: [PATCH 014/132] feat: tests for settings-network added and done

---
 source/hooks/useSettingsItems.jsx             |  1 +
 .../Network/components/NetworkCard/index.jsx  |  3 +-
 .../views/Extension/Views/Network/index.jsx   |  3 +-
 tests/e2e/import-create-account.test.js       |  2 +-
 tests/e2e/network.test.js                     | 31 ++-----
 ...acts.test.js => settings-contacts.test.js} |  0
 ...s => settings-export-dfx-identity.test.js} |  0
 .../{help.test.js => settings-help.test.js}   |  0
 tests/e2e/settings-network.test.js            | 91 +++++++++++++++++++
 ...> settings-secret-recovery-phrase.test.js} |  0
 tests/setup/jestSetup.js                      | 28 ++++++
 11 files changed, 133 insertions(+), 26 deletions(-)
 rename tests/e2e/{contacts.test.js => settings-contacts.test.js} (100%)
 rename tests/e2e/{export-dfx-identity.test.js => settings-export-dfx-identity.test.js} (100%)
 rename tests/e2e/{help.test.js => settings-help.test.js} (100%)
 create mode 100644 tests/e2e/settings-network.test.js
 rename tests/e2e/{secret-recovery-phrase.test.js => settings-secret-recovery-phrase.test.js} (100%)

diff --git a/source/hooks/useSettingsItems.jsx b/source/hooks/useSettingsItems.jsx
index 2a99e2cb..18f1adfd 100644
--- a/source/hooks/useSettingsItems.jsx
+++ b/source/hooks/useSettingsItems.jsx
@@ -29,6 +29,7 @@ const useSettingsItems = () => {
       logo: AntennaIcon,
       name: t('settings.network'),
       description: t('settings.networkDescription'),
+      'data-testid': 'network',
       onClick: (() => navigator.navigate('network')),
     },
     {
diff --git a/source/views/Extension/Views/Network/components/NetworkCard/index.jsx b/source/views/Extension/Views/Network/components/NetworkCard/index.jsx
index bf067010..3cd1b9dd 100644
--- a/source/views/Extension/Views/Network/components/NetworkCard/index.jsx
+++ b/source/views/Extension/Views/Network/components/NetworkCard/index.jsx
@@ -38,7 +38,7 @@ const NetworkCard = ({
 
   const isMainnet = id === 'mainnet';
   return (
-    <div onClick={selectNetwork} className={classes.networkCard}>
+    <div onClick={selectNetwork} className={classes.networkCard} data-testid={`network-card-${name}`}>
       <div className={classes.networkData}>
         <Typography variant="h4">{capitalize(name)}</Typography>
         <Typography variant="subtitle2">{host}</Typography>
@@ -49,6 +49,7 @@ const NetworkCard = ({
           className={classes.removeIcon}
           onClick={handleRemoveNetwork}
           size="18"
+          data-testid={`delete-network-button-${name}`}
         />
       )}
     </div>
diff --git a/source/views/Extension/Views/Network/index.jsx b/source/views/Extension/Views/Network/index.jsx
index 13ce5690..0a79916d 100644
--- a/source/views/Extension/Views/Network/index.jsx
+++ b/source/views/Extension/Views/Network/index.jsx
@@ -47,13 +47,14 @@ const Network = () => {
     <Layout>
       <Header
         center={<Typography variant="h2">{t('network.network')}</Typography>}
-        left={<LinkButton value={t('common.back')} onClick={navigator.goBack} startIcon={BackIcon} />}
+        left={<LinkButton value={t('common.back')} onClick={navigator.goBack} startIcon={BackIcon} data-testid="back-button" />}
         right={(
           <Button
             variant="rainbowOutlined"
             value={t('common.add')}
             style={{ height: 27, minWidth: 75 }}
             onClick={navigateTo('create-network')}
+            data-testid='add-network-button'
           />
 )}
       />
diff --git a/tests/e2e/import-create-account.test.js b/tests/e2e/import-create-account.test.js
index e313639a..d2d07ebe 100644
--- a/tests/e2e/import-create-account.test.js
+++ b/tests/e2e/import-create-account.test.js
@@ -124,7 +124,7 @@ describe('Import/Create', () => {
 
       const value = await page.evaluate((el) => el.textContent, plugBanner);
 
-      expect(value).toMatch('Alpha - 0.5.3');
+      expect(value).toMatch('Alpha - 0.6.0');
     });
   });
 
diff --git a/tests/e2e/network.test.js b/tests/e2e/network.test.js
index 945f2106..7a46ffa5 100644
--- a/tests/e2e/network.test.js
+++ b/tests/e2e/network.test.js
@@ -9,22 +9,11 @@ const selectNetworkCardClick = async (page, name) => {
   await selectNetworkButton.click();
 };
 
-const addNetworkButtonClick = async (page) => {
-  const addNetworkButton = await page.getByTestId('add-network-button', true);
-  await addNetworkButton.click();
-};
-
 const exitButtonClick = async (page, button) => {
   const addNetworkButton = await page.getByTestId(button, true);
   await addNetworkButton.click();
 };
 
-const inputFill = async (page, testId, value) => {
-  const input = await page.getByTestId(testId, true);
-  await input.click();
-  await input.type(value);
-};
-
 const isErrorMatch = async (page, testId, error) => {
   const inputErrorLabel = await page.getByTestId(testId, true);
   const errorMessage = await page.evaluate((el) => el.textContent, inputErrorLabel);
@@ -106,7 +95,7 @@ describe('Network', () => {
 
   test('checking that the Back and Close button sends a user from the Add Network flow to the Main flow', async () => {
     for (const data of exitButtonData) {
-      await addNetworkButtonClick(page);
+      await popupPageUtils.addNetworkButtonClick(page);
       await exitButtonClick(page, data);
       await page.waitForTestIdSelector('open-deposit-view-button', { hidden: false });
       await openSelectNetworkModalButtonClick(page, false);
@@ -114,22 +103,22 @@ describe('Network', () => {
   });
 
   test('checking inputs validation on Add Network flow', async () => {
-    await addNetworkButtonClick(page);
+    await popupPageUtils.addNetworkButtonClick(page);
     for (const data of wrongNetworkData) {
-      await inputFill(page, data.testId, data.value);
+      await popupPageUtils.inputFill(page, data.testId, data.value);
     }
-    await addNetworkButtonClick(page);
+    await popupPageUtils.addNetworkButtonClick(page);
     for (const data of inputsErrorsData) {
       await isErrorMatch(page, data.testId, data.errorMessage);
     }
   });
 
   test('adding a new network and switching on it/checking that the extension does not allow to add an existing network', async () => {
-    await addNetworkButtonClick(page);
+    await popupPageUtils.addNetworkButtonClick(page);
     for (const data of correctNetworkData) {
-      await inputFill(page, data.testId, data.value);
+      await popupPageUtils.inputFill(page, data.testId, data.value);
     }
-    await addNetworkButtonClick(page);
+    await popupPageUtils.addNetworkButtonClick(page);
     await openSelectNetworkModalButtonClick(page, false);
     await selectNetworkCardClick(page, networkName);
     await page.waitForTestIdSelector('network-selection-modal', { hidden: true });
@@ -139,11 +128,7 @@ describe('Network', () => {
 
     // checking that the extension does not allow to add an existing network
     await openSelectNetworkModalButtonClick(page, false);
-    await addNetworkButtonClick(page);
-    for (const data of correctNetworkData) {
-      await inputFill(page, data.testId, data.value);
-    }
-    await addNetworkButtonClick(page);
+    await popupPageUtils.addSonicNetwork(page);
     for (const data of inputsErrorsData2) {
       await isErrorMatch(page, data.testId, data.errorMessage);
     }
diff --git a/tests/e2e/contacts.test.js b/tests/e2e/settings-contacts.test.js
similarity index 100%
rename from tests/e2e/contacts.test.js
rename to tests/e2e/settings-contacts.test.js
diff --git a/tests/e2e/export-dfx-identity.test.js b/tests/e2e/settings-export-dfx-identity.test.js
similarity index 100%
rename from tests/e2e/export-dfx-identity.test.js
rename to tests/e2e/settings-export-dfx-identity.test.js
diff --git a/tests/e2e/help.test.js b/tests/e2e/settings-help.test.js
similarity index 100%
rename from tests/e2e/help.test.js
rename to tests/e2e/settings-help.test.js
diff --git a/tests/e2e/settings-network.test.js b/tests/e2e/settings-network.test.js
new file mode 100644
index 00000000..a4387980
--- /dev/null
+++ b/tests/e2e/settings-network.test.js
@@ -0,0 +1,91 @@
+const settingsButtonClick = async (page) => {
+  const settingsButton = await page.getByTestId('settings-button', true);
+  await settingsButton.click();
+};
+
+const networkButtonClick = async (page) => {
+  const seedPhraseButton = await page.getByTestId('network', true);
+  await seedPhraseButton.click();
+};
+
+const backButtonClick = async (page) => {
+  const closeButton = await page.getByTestId('back-button', true);
+  await closeButton.click();
+};
+
+const networkCardClick = async (page, name) => {
+  const closeButton = await page.getByTestId(`network-card-${name}`, true);
+  await closeButton.click();
+};
+
+const deleteNetworkButtonClick = async (page, name) => {
+  const closeButton = await page.getByTestId(`delete-network-button-${name}`, true);
+  await closeButton.click();
+};
+
+const isCurrentNetworkMatch = async (page, network) => {
+  const inputErrorLabel = await page.getByTestId('current-network-name', true);
+  const currentNetworkName = await page.evaluate((el) => el.textContent, inputErrorLabel);
+  expect(currentNetworkName).toBe(network);
+};
+
+describe('Settings: Help', () => {
+  let browser;
+  let page;
+
+  const sonic = 'Sonic';
+  const mainnet = 'Mainnet';
+
+  beforeAll(async () => {
+    browser = await setupChrome();
+
+    // Importing the account
+    page = await utils.createNewPage(browser);
+    await optionsPageUtils.importAccount(page, secrets.seedphrase, secrets.password);
+    await optionsPageUtils.unlock(page, secrets.password);
+
+    await page.close();
+  });
+
+  beforeEach(async () => {
+    page = await utils.createNewPage(browser);
+    await page.goto(chromeData.popupUrl);
+    await popupPageUtils.profileButtonClick(page);
+    await settingsButtonClick(page);
+    await networkButtonClick(page);
+  });
+
+  afterEach(async () => {
+    await page.close();
+  });
+
+  afterAll(async () => {
+    await browser.close();
+  });
+
+  test('checking that the Back button sends a user to the Settings', async () => {
+    await backButtonClick(page);
+    await page.waitForSelector('[data-testid="network"]');
+  });
+
+  test('adding the new network and checking that network change is correct after clicking on network card', async () => {
+    await popupPageUtils.addSonicNetwork(page);
+    await popupPageUtils.profileButtonClick(page);
+    await settingsButtonClick(page);
+    await networkButtonClick(page);
+    await networkCardClick(page, sonic);
+    await isCurrentNetworkMatch(page, sonic);
+    await networkCardClick(page, mainnet);
+    await isCurrentNetworkMatch(page, mainnet);
+  });
+
+  test('deleting the newly added network/checking that deleted network was deleted, and the current network changed on mainnet ', async () => {
+    await popupPageUtils.addSonicNetwork(page);
+    await popupPageUtils.profileButtonClick(page);
+    await settingsButtonClick(page);
+    await networkButtonClick(page);
+    await deleteNetworkButtonClick(page, sonic);
+    await page.waitForTestIdSelector('delete-network-button-Sonic', { hidden: false });
+    await isCurrentNetworkMatch(page, mainnet);
+  });
+});
diff --git a/tests/e2e/secret-recovery-phrase.test.js b/tests/e2e/settings-secret-recovery-phrase.test.js
similarity index 100%
rename from tests/e2e/secret-recovery-phrase.test.js
rename to tests/e2e/settings-secret-recovery-phrase.test.js
diff --git a/tests/setup/jestSetup.js b/tests/setup/jestSetup.js
index dc00c486..a761ae51 100644
--- a/tests/setup/jestSetup.js
+++ b/tests/setup/jestSetup.js
@@ -73,6 +73,12 @@ global.setupChrome = async () => {
 
 // General utils
 
+const sonicNetworkData = [
+  { testId: 'network-input-name', value: secrets.networkName },
+  { testId: 'network-input-host', value: secrets.hostName },
+  { testId: 'network-input-ledgerCanisterId', value: secrets.canisterID },
+];
+
 const getXPathElements = async (page, elementType, content, wait = false) => {
   const xPath = `//${elementType}[contains(.,"${content}")]`;
 
@@ -179,6 +185,25 @@ const createSubAccount = async (page, name) => {
   await page.waitForTestIdSelector(`account-name-${name}`);
 };
 
+const inputFill = async (page, testId, value) => {
+  const input = await page.getByTestId(testId, true);
+  await input.click();
+  await input.type(value);
+};
+
+const addNetworkButtonClick = async (page) => {
+  const addNetworkButton = await page.getByTestId('add-network-button', true);
+  await addNetworkButton.click();
+};
+
+const addSonicNetwork = async (page) => {
+  await addNetworkButtonClick(page);
+  for (const data of sonicNetworkData) {
+    await inputFill(page, data.testId, data.value);
+  }
+  await addNetworkButtonClick(page);
+};
+
 const optionsPageUtils = {
   importAccount,
   unlock,
@@ -190,6 +215,9 @@ const popupPageUtils = {
   profileButtonClick,
   fillNameInput,
   createAccountButtonClick,
+  addSonicNetwork,
+  inputFill,
+  addNetworkButtonClick,
 };
 
 global.popupPageUtils = popupPageUtils;

From 26387a63ef86ac0f59889ac60d3d2ef783febe94 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 5 Sep 2022 16:18:42 -0300
Subject: [PATCH 015/132] added get nfts after add custom in step2

---
 source/Background/Keyring/index.js            |  3 ++
 .../Extension/Views/AddNFT/Steps/Step2.jsx    | 29 +++++++++++++++----
 .../Views/AddNFT/components/CustomNFT.jsx     |  2 --
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index a17a054d..b539b44f 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -206,10 +206,12 @@ export const getKeyringHandler = (type, keyring) => ({
     return parsed;
   },
   [HANDLER_TYPES.GET_ASSETS]: async ({ refresh }) => {
+    console.log('se activa get assets!');
     try {
       if (!keyring?.isUnlocked) return {};
 
       const { wallets, currentWalletId } = await keyring.getState();
+      console.log('el keyring getState me devuelve', wallets, currentWalletId);
       let assets = Object.values(wallets?.[currentWalletId]?.assets);
       const shouldUpdate = Object.values(assets)?.every((asset) => !Number(asset.amount))
         || Object.values(assets)?.some((asset) => asset.amount === 'Error')
@@ -303,6 +305,7 @@ export const getKeyringHandler = (type, keyring) => ({
         const nfts = await keyring.registerNFT({
           canisterId, standard,
         });
+        console.log('desde plug luego de llamar a registerNFT del keyring ->', nfts);
         return (nfts || []).map((nft) => recursiveParseBigint(nft));
       } catch (e) {
         // eslint-disable-next-line
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
index 64122c97..1badbe04 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -3,16 +3,17 @@ import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 import { Typography } from '@material-ui/core';
 import Grid from '@material-ui/core/Grid';
-import XTCIcon from '@assets/icons/XTC.svg';
 import {
   Button, Container, USDFormat, AssetFormat,
   TokenIcon,
 } from '@components';
-import { USD_PER_TC, CYCLES_PER_TC } from '@shared/constants/currencies';
-import { useICPPrice } from '@redux/icp';
+
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import { setAssets, setAssetsLoading } from '@redux/wallet';
-import { useDispatch } from 'react-redux';
+import {
+  setCollections,
+  setCollectionsLoading,
+} from '@redux/wallet';
+import { useDispatch, useSelector } from 'react-redux';
 
 import useStyles from '../styles';
 
@@ -23,7 +24,8 @@ const Step2 = ({ selectedToken, handleClose }) => {
   const dispatch = useDispatch();
   const [loading, setLoading] = useState(false);
   // const displayToken = parseTokenBySymbol(selectedToken); // podemos agregar un parser para terminar con el ultimo objeto
-  const icpPrice = useICPPrice();
+
+  const { principalId } = useSelector((state) => state.wallet);
 
   const registerToken = () => {
     setLoading(true);
@@ -31,6 +33,21 @@ const Step2 = ({ selectedToken, handleClose }) => {
     sendMessage({
       type: HANDLER_TYPES.ADD_CUSTOM_NFT,
       params: selectedToken,
+    }, async () => {
+      sendMessage({
+        type: HANDLER_TYPES.GET_NFTS,
+        params: { refresh: true },
+      },
+        (nftCollections) => {
+          console.log('luego del getNFTS me da estas collections', nftCollections);
+          if (nftCollections?.length) {
+            dispatch(setCollections({ collections: nftCollections, principalId }));
+          }
+          dispatch(setCollectionsLoading(false));
+          setLoading(false);
+          handleClose();
+        }
+      );
     });
     console.log('salio todo correcto')
   };
diff --git a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
index e7527462..47b55f35 100644
--- a/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
+++ b/source/views/Extension/Views/AddNFT/components/CustomNFT.jsx
@@ -49,10 +49,8 @@ const CustomNFT = ({ handleChangeSelectedNFT }) => {
       },
       async (nftInfo) => {
         if (nftInfo?.error) {
-          console.log('ocurrio un error al devolver la info', nftInfo);
           setTokenError(nftInfo?.error);
         } else {
-          console.log('cheee llega la data', nftInfo);
           handleChangeSelectedNFT(nftInfo)();
         }
         setLoading(false);

From cf3453f1389e919406507f1ea7f40710fe4bef16 Mon Sep 17 00:00:00 2001
From: tomiir <rocchitomas@gmail.com>
Date: Mon, 5 Sep 2022 21:04:56 +0100
Subject: [PATCH 016/132] Fix: Redundant optimistic update (#587)

* Added controller with optimistic update fix. Removed filterCollectionTokens method as it was redundant

* Reconciliated yarn lock

* Renamed hook to blockNFTFetch and removed unnecessary formatting

* Restored lockfile

* Reinstalled controller'

Co-authored-by: rocky-fleek <tomas@fleek.co>
---
 package.json                                  |    2 +-
 source/redux/wallet.js                        |   24 +-
 .../SendNFT/components/ReviewStep/index.jsx   |    8 +-
 source/views/Extension/Views/SendNFT/utils.js |   27 -
 yarn.lock                                     | 1386 +++++++++--------
 5 files changed, 785 insertions(+), 662 deletions(-)

diff --git a/package.json b/package.json
index a503508c..b8b59b8c 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.8",
+    "@psychedelic/plug-controller": "0.19.10",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/redux/wallet.js b/source/redux/wallet.js
index 34bd7764..85ae4180 100644
--- a/source/redux/wallet.js
+++ b/source/redux/wallet.js
@@ -106,18 +106,6 @@ export const walletSlice = createSlice({
     setAssetsLoading: (state, action) => {
       state.assetsLoading = action.payload;
     },
-    addCollection: (state, action) => {
-      const { collection, walletNumber } = action.payload;
-      if (state.walletNumber === walletNumber && collection) {
-        const collectionIndex = state.collections.findIndex(
-          (col) => col.canisterId === collection.canisterId,
-        );
-        state?.collections.splice(
-          collectionIndex, collectionIndex < 0 ? 0 : 1, collection,
-        );
-        state.collections = sortCollections(state?.collections);
-      }
-    },
     setCollections: (state, action) => {
       const { collections, principalId } = action.payload;
       if (state.principalId === principalId && collections) {
@@ -128,14 +116,7 @@ export const walletSlice = createSlice({
     setCollectionsLoading: (state, action) => {
       state.collectionsLoading = action.payload;
     },
-    removeNFT: (state, action) => {
-      const collections = state.collections.map((col) => ({
-        ...col,
-        tokens: action.payload.collection === col.name
-          ? col.tokens.filter((token) => token.index !== action.payload?.index)
-          : col.tokens,
-      }));
-      state.collections = collections.filter((col) => col.tokens.length);
+    blockNFTFetch: (state) => {
       state.optimisticNFTUpdate = true;
     },
   },
@@ -148,10 +129,9 @@ export const {
   setTransactionsLoading,
   setAssets,
   setAssetsLoading,
-  addCollection,
   setCollections,
   setCollectionsLoading,
-  removeNFT,
+  blockNFTFetch,
 } = walletSlice.actions;
 
 export default walletSlice.reducer;
diff --git a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
index 125cc9ed..7aa2e63d 100644
--- a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
@@ -9,11 +9,10 @@ import {
   AddressTranslation,
 } from '@components';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import { removeNFT, setCollections } from '@redux/wallet';
+import { blockNFTFetch, setCollections } from '@redux/wallet';
 import { setSelectedNft } from '@redux/nfts';
 import { ADDRESS_TYPES } from '@shared/constants/addresses';
 
-import { getFilteredCollections } from '../../utils';
 import NFTDisplay from '../NFTDisplay';
 
 import useStyles from './styles';
@@ -42,12 +41,11 @@ const ReviewStep = () => {
         if (response.error) {
           setErrorMessage(response.error);
         } else {
-          const filteredCollections = getFilteredCollections(collection, collections, nft);
           dispatch(setCollections({
-            collections: filteredCollections,
+            collections: response,
             principalId,
           }));
-          dispatch(removeNFT(nft));
+          dispatch(blockNFTFetch());
           dispatch(setSelectedNft(null));
           navigator.navigate('home', TABS.NFTS);
         }
diff --git a/source/views/Extension/Views/SendNFT/utils.js b/source/views/Extension/Views/SendNFT/utils.js
index 45741268..c1f0be25 100644
--- a/source/views/Extension/Views/SendNFT/utils.js
+++ b/source/views/Extension/Views/SendNFT/utils.js
@@ -1,29 +1,2 @@
-export const getFilteredCollections = (collection, collections, nft) => {
-  const filterNFT = (token) => {
-    const id = token?.id ? 'id' : 'index';
-    return token?.[id] !== nft?.[id];
-  };
-  const collectionIndex = collections.indexOf(collection);
-  let filteredCollections = [...collections];
-
-  if (collection.tokens.length > 1) {
-    // If collection has tokens we filter them
-    const filteredCollection = JSON.parse(JSON.stringify(collection));
-    const tokens = collection.tokens.filter(filterNFT);
-
-    filteredCollections = [...collections];
-
-    filteredCollections[collectionIndex] = {
-      ...filteredCollection,
-      tokens,
-    };
-  } else {
-    // If tokens is empty remove collection
-    filteredCollections.splice(collectionIndex, 1);
-  }
-
-  return filteredCollections;
-};
-
 // Method that corrects icpunks image url. TODO: check if this is still needed
 export const fallbackPunksUrl = (url) => (url?.includes?.('https') ? url : `https://qcg3w-tyaaa-aaaah-qakea-cai.raw.ic0.app${url}`);
diff --git a/yarn.lock b/yarn.lock
index 45271ea4..fb1af662 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1118,7 +1118,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1149,7 +1149,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/string-locale-compare@^1.1.0":
+"@isaacs/string-locale-compare@^1.0.1":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -1593,71 +1593,64 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@*", "@npmcli/arborist@^5.6.1":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.1.tgz#8371fe6e38f2d9ebc57a77be9ac0a8276564aa07"
-  integrity sha512-bFEihRTSzIpJY+EJjyUUiTHkuZfFyn6ROlPzyVVDsHmysN8JRZ0LdgA/cwNuTGndb1ddsUxhSENhLp5pJHhX3Q==
+"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.8.3":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c"
+  integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA==
   dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
+    "@isaacs/string-locale-compare" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/map-workspaces" "^2.0.3"
-    "@npmcli/metavuln-calculator" "^3.0.1"
-    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/map-workspaces" "^1.0.2"
+    "@npmcli/metavuln-calculator" "^1.1.0"
+    "@npmcli/move-file" "^1.1.0"
     "@npmcli/name-from-folder" "^1.0.1"
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/query" "^1.2.0"
-    "@npmcli/run-script" "^4.1.3"
-    bin-links "^3.0.3"
-    cacache "^16.1.3"
+    "@npmcli/node-gyp" "^1.0.1"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.2"
+    bin-links "^2.2.1"
+    cacache "^15.0.3"
     common-ancestor-path "^1.0.1"
     json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
-    minimatch "^5.1.0"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.0"
-    npm-pick-manifest "^7.0.2"
-    npm-registry-fetch "^13.0.0"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    parse-conflict-json "^2.0.1"
-    proc-log "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.0"
+    npm-registry-fetch "^11.0.0"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
+    proc-log "^1.0.0"
     promise-all-reject-late "^1.0.0"
     promise-call-limit "^1.0.1"
     read-package-json-fast "^2.0.2"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.7"
-    ssri "^9.0.0"
-    treeverse "^2.0.0"
+    semver "^7.3.5"
+    ssri "^8.0.1"
+    treeverse "^1.0.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/ci-detect@*", "@npmcli/ci-detect@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
-  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
+"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
+  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
 
-"@npmcli/config@*":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.2.2.tgz#2e3334dda84f48d059309c53d152e66b05ca24b7"
-  integrity sha512-5GNcLd+0c4bYBnFop53+26CO5GQP0R9YcxlernohpHDWdIgzUg9I0+GEMk3sNHnLntATVU39d283A4OO+W402w==
+"@npmcli/config@^2.3.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.4.0.tgz#1447b0274f9502871dabd3ab1d8302472d515b1f"
+  integrity sha512-fwxu/zaZnvBJohXM3igzqa3P1IVYWi5N343XcKvKkJbAx+rTqegS5tAul4NLiMPQh6WoS5a4er6oo/ieUx1f4g==
   dependencies:
-    "@npmcli/map-workspaces" "^2.0.2"
-    ini "^3.0.0"
+    ini "^2.0.0"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    proc-log "^2.0.0"
-    read-package-json-fast "^2.0.3"
-    semver "^7.3.5"
+    nopt "^5.0.0"
+    semver "^7.3.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/disparity-colors@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
-  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
+"@npmcli/disparity-colors@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
+  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
   dependencies:
     ansi-styles "^4.3.0"
 
@@ -1669,30 +1662,21 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/fs@^2.1.0", "@npmcli/fs@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/git@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931"
-  integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==
+"@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
-    "@npmcli/promise-spawn" "^3.0.0"
-    lru-cache "^7.4.4"
+    "@npmcli/promise-spawn" "^1.3.2"
+    lru-cache "^6.0.0"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^7.0.0"
-    proc-log "^2.0.0"
+    npm-pick-manifest "^6.1.1"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.7":
+"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -1700,27 +1684,26 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
-  integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg==
+"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
+  integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
   dependencies:
     "@npmcli/name-from-folder" "^1.0.1"
-    glob "^8.0.1"
-    minimatch "^5.0.1"
-    read-package-json-fast "^2.0.3"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+    read-package-json-fast "^2.0.1"
 
-"@npmcli/metavuln-calculator@^3.0.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622"
-  integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA==
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
   dependencies:
-    cacache "^16.0.0"
-    json-parse-even-better-errors "^2.3.1"
-    pacote "^13.0.3"
-    semver "^7.3.5"
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
 
-"@npmcli/move-file@^1.0.1":
+"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
@@ -1728,57 +1711,39 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/name-from-folder@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
   integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/node-gyp@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
-  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
+  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
-"@npmcli/package-json@*", "@npmcli/package-json@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
-  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+"@npmcli/package-json@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
+  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
   dependencies:
     json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/promise-spawn@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
-  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/query@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-1.2.0.tgz#46468d583cf013aa92102970700f9555314aabe4"
-  integrity sha512-uWglsUM3PjBLgTSmZ3/vygeGdvWEIZ3wTUnzGFbprC/RtvQSaT+GAXu1DXmSFj2bD3oOZdcRm1xdzsV2z1YWdw==
-  dependencies:
-    npm-package-arg "^9.1.0"
-    postcss-selector-parser "^6.0.10"
-    semver "^7.3.7"
-
-"@npmcli/run-script@*", "@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946"
-  integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==
+"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6":
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
+  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
   dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^9.0.0"
-    read-package-json-fast "^2.0.3"
-    which "^2.0.2"
+    "@npmcli/node-gyp" "^1.0.2"
+    "@npmcli/promise-spawn" "^1.3.2"
+    node-gyp "^7.1.0"
+    read-package-json-fast "^2.0.1"
 
 "@psychedelic/browser-rpc@2.1.0":
   version "2.1.0"
@@ -1828,10 +1793,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.19.8":
-  version "0.19.8"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.8/0d6ca60ad6449c0d20aa193e5d29dac578d2b941#0d6ca60ad6449c0d20aa193e5d29dac578d2b941"
-  integrity sha512-9Qe+p9m6Ju/Me73XrVYjlDbooRffW4O6fPTl3PIhWvApU22i9bdj7hak/1cC7e9qh5fwah4nk7r5k/avRgS71w==
+"@psychedelic/plug-controller@0.19.10":
+  version "0.19.10"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.10/a68fd3461d0d88a27e62321c5ba0963203f60ac9#a68fd3461d0d88a27e62321c5ba0963203f60ac9"
+  integrity sha512-EUiChzWlSqTNQRDmiy+2YRdnEfgc2zEpWxBxm284wa0yZhAO1hp3jZE3NauO/HkfL/ahiZeQbJ6q07uvNYlxmA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1933,11 +1898,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.1.19"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
@@ -2441,7 +2401,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@*, abbrev@1, abbrev@^1.0.0:
+abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2499,7 +2459,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -2526,7 +2486,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2563,7 +2523,7 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
+ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2597,12 +2557,12 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
   integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
 
-ansicolors@*:
+ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
 
-ansistyles@*:
+ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
   integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
@@ -2623,16 +2583,16 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 archiver-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
@@ -2662,19 +2622,27 @@ archiver@^5.3.0:
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
-archy@*:
+archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2794,6 +2762,18 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, 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==
+
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2849,6 +2829,16 @@ autoprefixer@^10.0.2:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
 axe-core@^4.4.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
@@ -3664,6 +3654,13 @@ bash-path@^1.0.1:
     arr-union "^3.1.0"
     is-windows "^1.0.1"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3681,17 +3678,17 @@ bignumber.js@^9.0.0:
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62"
   integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==
 
-bin-links@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.3.tgz#3842711ef3db2cd9f16a5f404a996a12db355a6e"
-  integrity sha512-zKdnMPWEdh4F5INR07/eBrodC7QrF5JKvqskjz/ZZRXg5YSAZIbn8zGhbhUrElzHBZ2fvEQdOU59RHcTG3GiwA==
+bin-links@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967"
+  integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA==
   dependencies:
-    cmd-shim "^5.0.0"
+    cmd-shim "^4.0.1"
     mkdirp-infer-owner "^2.0.0"
-    npm-normalize-package-bin "^2.0.0"
-    read-cmd-shim "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
+    read-cmd-shim "^2.0.0"
     rimraf "^3.0.0"
-    write-file-atomic "^4.0.0"
+    write-file-atomic "^3.0.3"
 
 binary-extensions@^1.0.0:
   version "1.13.1"
@@ -3964,36 +3961,10 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
-
-cacache@*, cacache@^16.0.0, cacache@^16.1.0, cacache@^16.1.3:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -4016,7 +3987,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.5:
+cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -4132,10 +4103,10 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-chalk@*:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
-  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 chalk@^1.1.3:
   version "1.1.3"
@@ -4212,16 +4183,16 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@*, chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
 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==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -4287,13 +4258,13 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-columns@*:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
-  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
+cli-columns@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
+  integrity sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==
   dependencies:
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.1"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -4302,7 +4273,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@*:
+cli-table3@^0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
   integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
@@ -4375,10 +4346,10 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
-cmd-shim@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
-  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
@@ -4396,6 +4367,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4441,7 +4417,7 @@ color-string@1.5.5, color-string@^0.3.0, color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -4473,15 +4449,15 @@ colors@1.4.0, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@*:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==
   dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4575,7 +4551,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -4656,6 +4632,11 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+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==
+
 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"
@@ -5048,6 +5029,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5228,7 +5216,7 @@ diff-sequences@^28.1.1:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
   integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
 
-diff@^5.1.0:
+diff@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
   integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
@@ -5393,6 +5381,14 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 ed25519-hd-key@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ed25519-hd-key/-/ed25519-hd-key-1.3.0.tgz#e0bd2be4c07e15c753d5ed3aca30744e321b7c78"
@@ -5459,7 +5455,7 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-encoding@^0.1.13:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -5978,6 +5974,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extensionizer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/extensionizer/-/extensionizer-1.0.1.tgz#504544239a7610ba8404b15c1832091a37768d09"
@@ -6008,6 +6009,16 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+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==
+
 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"
@@ -6046,7 +6057,7 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fastest-levenshtein@*, fastest-levenshtein@^1.0.12:
+fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
@@ -6272,6 +6283,11 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -6281,6 +6297,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 fraction.js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
@@ -6385,19 +6410,34 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    wide-align "^1.1.2"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6455,6 +6495,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-parent@5.1.2, glob-parent@^3.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -6467,18 +6514,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@*, glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6562,11 +6598,24 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.8, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -6620,7 +6669,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
@@ -6722,12 +6771,12 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@*, hosted-git-info@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
-  integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
+hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
-    lru-cache "^7.5.1"
+    lru-cache "^6.0.0"
 
 hsl-regex@^1.0.0:
   version "1.0.0"
@@ -6810,14 +6859,14 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -6902,12 +6951,12 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore-walk@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
-  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+ignore-walk@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
-    minimatch "^5.0.1"
+    minimatch "^3.0.4"
 
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
@@ -6991,28 +7040,28 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-ini@*, ini@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
-
 ini@^1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-init-package-json@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
-  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+
+init-package-json@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
   dependencies:
-    npm-package-arg "^9.0.1"
+    npm-package-arg "^8.1.5"
     promzard "^0.3.0"
-    read "^1.0.7"
-    read-package-json "^5.0.0"
+    read "~1.0.1"
+    read-package-json "^4.1.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^4.0.0"
+    validate-npm-package-name "^3.0.0"
 
 internal-slot@^1.0.3:
   version "1.0.3"
@@ -7120,7 +7169,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@*:
+is-cidr@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
   integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
@@ -7139,7 +7188,7 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.5.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"
   integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
@@ -7207,6 +7256,18 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
 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"
@@ -7360,7 +7421,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -7414,6 +7475,11 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -8012,6 +8078,11 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsconfig-paths-jest-mapper@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsconfig-paths-jest-mapper/-/jsconfig-paths-jest-mapper-1.0.0.tgz#cd8570e9f6eabb33890b27eb51bc7b6e91a8564e"
@@ -8074,7 +8145,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   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==
@@ -8089,6 +8160,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8099,6 +8175,11 @@ json-stringify-nice@^1.1.4:
   resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
   integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
 
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json-text-sequence@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2"
@@ -8132,6 +8213,16 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
 jss-plugin-camel-case@^10.5.1:
   version "10.9.2"
   resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.2.tgz#76dddfa32f9e62d17daa4e3504991fd0933b89e1"
@@ -8215,15 +8306,15 @@ junk@^3.1.0:
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
-just-diff-apply@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b"
-  integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g==
+just-diff-apply@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
+  integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
 
-just-diff@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202"
-  integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ==
+just-diff@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
+  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
 
 keycode@^2.1.7:
   version "2.2.1"
@@ -8329,118 +8420,115 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@*:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.4.tgz#2dd158bd8a071817e2207d3b201d37cf1ad6ae6b"
-  integrity sha512-qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag==
+libnpmaccess@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
 
-libnpmdiff@*:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.5.tgz#ffaf93fa9440ea759444b8830fdb5c661b09a7c0"
-  integrity sha512-9fICQIzmH892UwHHPmb+Seup50UIBWcMIK2FdxvlXm9b4kc1nSH0b/BuY1mORJQtB6ydPMnn+BLzOTmd/SKJmw==
+libnpmdiff@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
+  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
   dependencies:
-    "@npmcli/disparity-colors" "^2.0.0"
+    "@npmcli/disparity-colors" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
     binary-extensions "^2.2.0"
-    diff "^5.1.0"
-    minimatch "^5.0.1"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    diff "^5.0.0"
+    minimatch "^3.0.4"
+    npm-package-arg "^8.1.1"
+    pacote "^11.3.0"
     tar "^6.1.0"
 
-libnpmexec@*:
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.12.tgz#462955cdc80894122a09720ccb86e074989ab209"
-  integrity sha512-iGk63HwzPz6U2mDyuUu0AV4f/yWpxxbrly6LUJgZZ3tD00qVgV530oI4sr3baTLzq8VOyQeDJr0wmEdpXJsHjQ==
+libnpmexec@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
+  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
   dependencies:
-    "@npmcli/arborist" "^5.6.1"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/fs" "^2.1.1"
-    "@npmcli/run-script" "^4.2.0"
+    "@npmcli/arborist" "^2.3.0"
+    "@npmcli/ci-detect" "^1.3.0"
+    "@npmcli/run-script" "^1.8.4"
     chalk "^4.1.0"
     mkdirp-infer-owner "^2.0.0"
-    npm-package-arg "^9.0.1"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    proc-log "^2.0.0"
+    npm-package-arg "^8.1.2"
+    pacote "^11.3.1"
+    proc-log "^1.0.0"
     read "^1.0.7"
     read-package-json-fast "^2.0.2"
-    semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@*:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.3.tgz#334a3bb58c64ad18803056373545f6528b04dceb"
-  integrity sha512-vIlrudn2vzCQ8YRiImh/Kcf6/igjITDNqJPm2ifQDLJIrtqHc22BQb1SCyH+bajHL/DVHzGKD4VuxUtLHT641w==
+libnpmfund@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
+  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
   dependencies:
-    "@npmcli/arborist" "^5.6.1"
+    "@npmcli/arborist" "^2.5.0"
 
-libnpmhook@*:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.4.tgz#6c58e5fe763ff5d600ae9c20457ea9a69d1f7d87"
-  integrity sha512-nuD6e+Nx0OprjEi0wOeqASMl6QIH235th/Du2/8upK3evByFhzIgdfOeP1OhstavW4xtsl0hk5Vw4fAWWuSUgA==
+libnpmhook@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30"
+  integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmorg@*:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.4.tgz#2a01d49372cf0df90d79a61e69bddaf2ed704311"
-  integrity sha512-1bTpD7iub1rDCsgiBguhJhiDufLQuc8DEti20euqsXz9O0ncXVpCYqf2SMmHR4GEdmAvAj2r7FMiyA9zGdaTpA==
+libnpmorg@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc"
+  integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmpack@*:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.1.3.tgz#025cfe39829acd8260662bf259e3a9331fc1e4b2"
-  integrity sha512-rYP4X++ME3ZiFO+2iN3YnXJ4LB4Gsd0z5cgszWJZxaEpDN4lRIXirSyynGNsN/hn4taqnlxD+3DPlFDShvRM8w==
+libnpmpack@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
+  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
   dependencies:
-    "@npmcli/run-script" "^4.1.3"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    "@npmcli/run-script" "^1.8.3"
+    npm-package-arg "^8.1.0"
+    pacote "^11.2.6"
 
-libnpmpublish@*:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.5.tgz#5a894f3de2e267d62f86be2a508e362599b5a4b1"
-  integrity sha512-LUR08JKSviZiqrYTDfywvtnsnxr+tOvBU0BF8H+9frt7HMvc6Qn6F8Ubm72g5hDTHbq8qupKfDvDAln2TVPvFg==
+libnpmpublish@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
   dependencies:
-    normalize-package-data "^4.0.0"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
-    semver "^7.3.7"
-    ssri "^9.0.0"
+    normalize-package-data "^3.0.2"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
+    semver "^7.1.3"
+    ssri "^8.0.1"
 
-libnpmsearch@*:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.4.tgz#b32aa2b23051c00cdcc0912274d0d416e6655d81"
-  integrity sha512-XHDmsvpN5+pufvGnfLRqpy218gcGGbbbXR6wPrDJyd1em6agKdYByzU5ccskDHH9iVm2UeLydpDsW1ksYuU0cg==
+libnpmsearch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3"
+  integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==
   dependencies:
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmteam@*:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.4.tgz#ac26068808d93b1051d926457db14e4b3ff669ef"
-  integrity sha512-rzKSwi6MLzwwevbM/vl+BBQTErgn24tCfgPUdzBlszrw3j5necOu7WnTzgvZMDv6maGUwec6Ut1rxszOgH0l+Q==
+libnpmteam@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c"
+  integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmversion@*:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.7.tgz#e4c6c07ee28cf351ce1e2293a5ac9922b09ea94d"
-  integrity sha512-O0L4eNMUIMQ+effi1HsZPKp2N6wecwqGqB8PvkvmLPWN7EsdabdzAVG48nv0p/OjlbIai5KQg/L+qMMfCA4ZjA==
+libnpmversion@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9"
+  integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/run-script" "^4.1.3"
+    "@npmcli/git" "^2.0.7"
+    "@npmcli/run-script" "^1.8.4"
     json-parse-even-better-errors "^2.3.1"
-    proc-log "^2.0.0"
-    semver "^7.3.7"
+    semver "^7.3.5"
+    stringify-package "^1.0.1"
 
 lilconfig@2.0.5:
   version "2.0.5"
@@ -8650,11 +8738,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
-  integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
-
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -8670,27 +8753,27 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@*, make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
+make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
     http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
+    http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
     minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
+    minipass-fetch "^1.3.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
+    negotiator "^0.6.2"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
 
 makeerror@1.0.12:
   version "1.0.12"
@@ -8805,7 +8888,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8848,7 +8931,7 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
@@ -8867,16 +8950,16 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
   dependencies:
-    minipass "^3.1.6"
+    minipass "^3.1.0"
     minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
+    minizlib "^2.0.0"
   optionalDependencies:
-    encoding "^0.1.13"
+    encoding "^0.1.12"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
@@ -8893,7 +8976,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -8907,14 +8990,14 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@*, minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
   integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -8959,7 +9042,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
+mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -8968,11 +9051,6 @@ mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -8980,6 +9058,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 moment@^2.29.1:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -8997,11 +9080,6 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@*, ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9012,6 +9090,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -9049,7 +9132,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.3:
+negotiator@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9106,20 +9189,20 @@ node-gyp-build@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
   integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
 
-node-gyp@*, node-gyp@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
-  integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
+node-gyp@^7.1.0, node-gyp@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
+    graceful-fs "^4.2.3"
     nopt "^5.0.0"
-    npmlog "^6.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
     rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -9161,13 +9244,6 @@ node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-nopt@*, nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -9175,15 +9251,15 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
-  integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
-    hosted-git-info "^5.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -9207,10 +9283,10 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-audit-report@*:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
-  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
+npm-audit-report@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
   dependencies:
     chalk "^4.0.0"
 
@@ -9221,80 +9297,65 @@ npm-bundled@^1.1.1:
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-bundled@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-2.0.1.tgz#94113f7eb342cd7a67de1e789f896b04d2c600f4"
-  integrity sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==
-  dependencies:
-    npm-normalize-package-bin "^2.0.0"
-
-npm-install-checks@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
-  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
-npm-normalize-package-bin@^1.0.1:
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-normalize-package-bin@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff"
-  integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
 
-npm-package-arg@*, npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
-  integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
+npm-packlist@^2.1.4:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
-    hosted-git-info "^5.0.0"
-    proc-log "^2.0.1"
-    semver "^7.3.5"
-    validate-npm-package-name "^4.0.0"
-
-npm-packlist@^5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b"
-  integrity sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==
-  dependencies:
-    glob "^8.0.1"
-    ignore-walk "^5.0.1"
-    npm-bundled "^2.0.0"
-    npm-normalize-package-bin "^2.0.0"
-
-npm-pick-manifest@*, npm-pick-manifest@^7.0.0, npm-pick-manifest@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.2.tgz#1d372b4e7ea7c6712316c0e99388a73ed3496e84"
-  integrity sha512-gk37SyRmlIjvTfcYl6RzDbSmS9Y4TOBXfsPnoYqTHARNgWbyDiCSMLUpmALDj4jjcTZpURiEfsSHJj9k7EV4Rw==
-  dependencies:
-    npm-install-checks "^5.0.0"
-    npm-normalize-package-bin "^2.0.0"
-    npm-package-arg "^9.0.0"
-    semver "^7.3.5"
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
 
-npm-profile@*:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.2.1.tgz#975c31ec75a6ae029ab5b8820ffdcbae3a1e3d5e"
-  integrity sha512-Tlu13duByHyDd4Xy0PgroxzxnBYWbGGL5aZifNp8cx2DxUrHSoETXtPKg38aRPsBWMRfDtvcvVfJNasj7oImQQ==
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
   dependencies:
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^8.1.2"
+    semver "^7.3.4"
+
+npm-profile@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
+  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
+  dependencies:
+    npm-registry-fetch "^11.0.0"
 
-npm-registry-fetch@*, npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
-  integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
+npm-registry-fetch@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
   dependencies:
-    make-fetch-happen "^10.0.6"
-    minipass "^3.1.6"
-    minipass-fetch "^2.0.3"
+    make-fetch-happen "^9.0.1"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^9.0.1"
-    proc-log "^2.0.0"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -9317,7 +9378,7 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@*:
+npm-user-validate@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
@@ -9396,14 +9457,24 @@ npm@7.22.0:
     which "^2.0.2"
     write-file-atomic "^3.0.3"
 
-npmlog@*, npmlog@^6.0.0, npmlog@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
   dependencies:
-    are-we-there-yet "^3.0.0"
+    are-we-there-yet "^2.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.3"
+    gauge "^3.0.0"
     set-blocking "^2.0.0"
 
 nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
@@ -9413,11 +9484,21 @@ nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+
 nwsapi@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
   integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
 
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -9532,7 +9613,7 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-opener@*:
+opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -9676,32 +9757,30 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@*, pacote@^13.0.3, pacote@^13.6.1:
-  version "13.6.2"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
-  integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==
+pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5:
+  version "11.3.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
+  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/promise-spawn" "^3.0.0"
-    "@npmcli/run-script" "^4.1.0"
-    cacache "^16.0.0"
+    "@npmcli/git" "^2.1.0"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.8.2"
+    cacache "^15.0.5"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.6"
-    mkdirp "^1.0.4"
-    npm-package-arg "^9.0.0"
-    npm-packlist "^5.1.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^2.1.4"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^11.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^5.0.0"
-    read-package-json-fast "^2.0.3"
+    read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
+    ssri "^8.0.1"
+    tar "^6.1.0"
 
 pako@~1.0.5:
   version "1.0.11"
@@ -9743,14 +9822,14 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-conflict-json@*, parse-conflict-json@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
-  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+parse-conflict-json@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
+  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
   dependencies:
-    json-parse-even-better-errors "^2.3.1"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
+    json-parse-even-better-errors "^2.3.0"
+    just-diff "^3.0.1"
+    just-diff-apply "^3.0.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -9874,6 +9953,11 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -10238,7 +10322,7 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10347,10 +10431,10 @@ private@^0.1.6:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-proc-log@^2.0.0, proc-log@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
-  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+proc-log@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
+  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -10441,7 +10525,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
-psl@^1.1.33:
+psl@^1.1.28, psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -10526,7 +10610,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qrcode-terminal@*:
+qrcode-terminal@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -10541,6 +10625,11 @@ qrcode@^1.4.4:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
 query-string@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
@@ -10778,12 +10867,12 @@ react@^17.0.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-cmd-shim@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087"
-  integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==
+read-cmd-shim@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10791,24 +10880,24 @@ read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@*, read-package-json@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa"
-  integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q==
+read-package-json@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
-    glob "^8.0.1"
-    json-parse-even-better-errors "^2.3.1"
-    normalize-package-data "^4.0.0"
-    npm-normalize-package-bin "^2.0.0"
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
 
-read@*, read@1, read@^1.0.7:
+read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   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==
@@ -10850,7 +10939,7 @@ readdir-glob@^1.0.0:
   dependencies:
     minimatch "^5.1.0"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -11051,6 +11140,32 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -11201,7 +11316,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-rimraf@*, rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -11266,7 +11381,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -11342,13 +11457,6 @@ secp256k1@^4.0.0, secp256k1@^4.0.2:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-semver@*, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -11364,6 +11472,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -11378,7 +11493,7 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -11551,10 +11666,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+socks-proxy-agent@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
@@ -11682,12 +11797,20 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-ssri@*, ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
+sshpk@^1.7.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
   version "6.0.2"
@@ -11696,7 +11819,7 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -11773,6 +11896,15 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11782,6 +11914,14 @@ string-length@^4.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -11844,6 +11984,11 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -11851,6 +11996,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -12031,7 +12183,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@*, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12119,7 +12271,7 @@ text-encoding@^0.7.0:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
   integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==
 
-text-table@*, 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 sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -12149,7 +12301,7 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
-tiny-relative-date@*:
+tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -12228,6 +12380,14 @@ tough-cookie@^4.0.0:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -12245,10 +12405,10 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@*, treeverse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
-  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
@@ -12270,11 +12430,23 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -12399,13 +12571,6 @@ unique-filename@^1.1.1:
   dependencies:
     unique-slug "^2.0.0"
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
 unique-slug@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
@@ -12413,13 +12578,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
@@ -12568,6 +12726,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuidv4@^6.2.13:
   version "6.2.13"
   resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-6.2.13.tgz#8f95ec5ef22d1f92c8e5d4c70b735d1c89572cb7"
@@ -12590,7 +12753,7 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
 
-validate-npm-package-license@^3.0.4:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -12598,18 +12761,27 @@ validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@*, validate-npm-package-name@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
-  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
   dependencies:
-    builtins "^5.0.0"
+    builtins "^1.0.3"
 
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -12852,13 +13024,6 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
-which@*, which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^1.2.12, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -12866,7 +13031,14 @@ which@^1.2.12, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.5:
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -12913,15 +13085,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@*, write-file-atomic@^4.0.0, write-file-atomic@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -12931,6 +13095,14 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+write-file-atomic@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 ws@8.5.0:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"

From 15b787d3164e140af4ba75399f770775a4fc5a43 Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Tue, 6 Sep 2022 16:27:17 +0200
Subject: [PATCH 017/132] feat: send custom tokens on sonic network tests added
 and passed

---
 tests/e2e/send-tokens.test.js      | 91 +++++++++++++++++++++++++++++-
 tests/e2e/settings-network.test.js |  1 -
 tests/setup/jestSetup.js           |  3 +
 3 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/send-tokens.test.js b/tests/e2e/send-tokens.test.js
index 5b2b2cb1..49cdd77a 100644
--- a/tests/e2e/send-tokens.test.js
+++ b/tests/e2e/send-tokens.test.js
@@ -14,6 +14,8 @@ const getAvailableAmount = async (page, shouldFormat = true) => {
 
   const availableAmountString = await page.evaluate((element) => element.innerText, availableAmountTag);
 
+  console.log('availableAmountString', availableAmountString);
+
   return shouldFormat ? formatTokenAmount(availableAmountString) : availableAmountString;
 };
 
@@ -60,6 +62,17 @@ const continueButtonClick = async (page) => {
   await continueButton.click();
 };
 
+const openSelectNetworkModalButtonClick = async (page, boolean) => {
+  const openSelectNetworkModalButton = await page.getByTestId('network-selector', true);
+  await openSelectNetworkModalButton.click();
+  await page.waitForTestIdSelector('network-selection-modal', { hidden: boolean });
+};
+
+const selectNetworkCardClick = async (page, name) => {
+  const selectNetworkButton = await page.getByTestId(`network-card-${name}`, true);
+  await selectNetworkButton.click();
+};
+
 async function addCustomToken(page, { name, canisterId, standard }) {
   await addCustomTokenButtonClick(page);
   await addCustomTokenTabItemClick(page, 'Custom');
@@ -74,7 +87,8 @@ async function addCustomToken(page, { name, canisterId, standard }) {
   await addButton.click();
 
   const assetTitle = await page.getByTestId(`asset-name-${name}`, true);
-  await page.evaluate((el) => el.textContent, assetTitle);
+  const assetTitleText = await page.evaluate((el) => el.textContent, assetTitle);
+  expect(assetTitleText).toBe(name);
 }
 
 const selectToken = async (page, tokenName) => {
@@ -107,6 +121,7 @@ const tokenBalanceCheck = async (page, { previousAmount, name }) => {
   const assetAmountString = await page.evaluate((element) => element.innerText, assetAmount);
 
   const newAmount = formatTokenAmount(assetAmountString);
+  console.log('newAmount', newAmount);
   const sentAmount = Number((previousAmount - newAmount).toFixed(4));
 
   expect(sentAmount).toBe(AMOUNT_TO_SEND);
@@ -360,3 +375,77 @@ describe('Send Custom Tokens', () => {
     expect(isContinueButtonDisabled).toBe(true);
   });
 });
+
+describe('Send Custom Tokens on Sonic Network', () => {
+  let browser;
+  let page;
+
+  const networkName = 'Sonic';
+
+  const customTokenData = [
+    { canisterId: secrets.xtcCanisterId, name: 'Cycles', standard: 'DIP20' },
+    { canisterId: secrets.wicpCanisterId, name: 'Wrapped ICP', standard: 'DIP20' },
+    { canisterId: secrets.testCoinCanisterId, name: 'Test Coin', standard: 'DIP20' },
+  ];
+
+  beforeAll(async () => {
+    browser = await setupChrome();
+
+    // Importing and unlocking the account
+    page = await utils.createNewPage(browser);
+
+    await optionsPageUtils.importAccount(page, secrets.seedphrase, secrets.password);
+    await optionsPageUtils.unlock(page, secrets.password);
+
+    await page.close();
+  });
+
+  beforeEach(async () => {
+    page = await utils.createNewPage(browser);
+    await page.goto(chromeData.popupUrl);
+  });
+
+  afterEach(async () => {
+    await page.close();
+  });
+
+  afterAll(async () => {
+    await browser.close();
+  });
+
+  test('successfully adding custom token', async () => {
+    await openSelectNetworkModalButtonClick(page, false);
+    await popupPageUtils.addSonicNetwork(page);
+    await openSelectNetworkModalButtonClick(page, false);
+    await selectNetworkCardClick(page, networkName);
+
+    for (const data of customTokenData) {
+      await addCustomToken(page, data);
+    }
+  });
+
+  test('successfully sending custom token', async () => {
+    await sendViewButtonClick(page);
+    const previousAmounts = [];
+    await waitForAmount(page);
+
+    for (const data of customTokenData) {
+      await selectToken(page, data.name);
+      const previousAmount = await getAvailableAmount(page);
+      console.log('pam', previousAmount);
+      await recipientPrincipalIdEnter(page);
+      await sendToken(page, data.name);
+      previousAmounts.push(previousAmount);
+      await popupPageUtils.refreshWallet(page);
+      await sendViewButtonClick(page);
+    }
+    await cancelButtonClick(page);
+    await waitForBalanceChange(page);
+
+    for (const [index, data] of customTokenData.entries()) {
+      const previousAmount = previousAmounts[index];
+
+      await tokenBalanceCheck(page, { previousAmount, name: data.name });
+    }
+  });
+});
diff --git a/tests/e2e/settings-network.test.js b/tests/e2e/settings-network.test.js
index a4387980..c56cd907 100644
--- a/tests/e2e/settings-network.test.js
+++ b/tests/e2e/settings-network.test.js
@@ -80,7 +80,6 @@ describe('Settings: Help', () => {
   });
 
   test('deleting the newly added network/checking that deleted network was deleted, and the current network changed on mainnet ', async () => {
-    await popupPageUtils.addSonicNetwork(page);
     await popupPageUtils.profileButtonClick(page);
     await settingsButtonClick(page);
     await networkButtonClick(page);
diff --git a/tests/setup/jestSetup.js b/tests/setup/jestSetup.js
index a761ae51..81d5e962 100644
--- a/tests/setup/jestSetup.js
+++ b/tests/setup/jestSetup.js
@@ -16,6 +16,9 @@ global.secrets = {
   dustCanisterId: process.env.DUST_CANISTER_ID,
   betaCanisterId: process.env.BETA_CANISTER_ID,
   wtcCanisterId: process.env.WTC_CANISTER_ID,
+  xtcCanisterId: process.env.XTC_CANISTER_ID,
+  wicpCanisterId: process.env.WICP_CANISTER_ID,
+  testCoinCanisterId: process.env.TEST_COIN_CANISTER_ID,
   wrongAccountId: process.env.WRONG_ACCOUNT_ID,
   wrongCanisterId: process.env.WRONG_CANISTER_ID,
   wrongId: process.env.WRONG_ID,

From 088f7ac69d1df6314169d63df3d7f5f40136cedf Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Tue, 6 Sep 2022 16:52:45 +0200
Subject: [PATCH 018/132] fix: hardcode fixes

---
 tests/e2e/import-create-account.test.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/import-create-account.test.js b/tests/e2e/import-create-account.test.js
index d2d07ebe..d6e34811 100644
--- a/tests/e2e/import-create-account.test.js
+++ b/tests/e2e/import-create-account.test.js
@@ -1,3 +1,5 @@
+const MINIMUM_PLUG_VERSION_ALLOWED = 60;
+
 const getErrorMessage = async (page, error) => {
   const passwordErrorLabel = await page.getByTestId('password-error', true);
   const errorMessage = await page.evaluate((el) => el.textContent, passwordErrorLabel);
@@ -123,8 +125,10 @@ describe('Import/Create', () => {
       const plugBanner = await page.getByTestId('banner-text', true);
 
       const value = await page.evaluate((el) => el.textContent, plugBanner);
+      const [, rawVersion] = value.split(' - ');
+      const version = rawVersion.split('.').join('');
 
-      expect(value).toMatch('Alpha - 0.6.0');
+      expect(Number(version)).toBeGreaterThanOrEqual(MINIMUM_PLUG_VERSION_ALLOWED);
     });
   });
 

From 10929ca2593e80b74f90e9d91d68a5ac57d17c6a Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Tue, 6 Sep 2022 18:00:52 +0200
Subject: [PATCH 019/132] feat: case with checking that tabs are blocked added

---
 tests/e2e/network.test.js     | 16 ++++++++++++++--
 tests/e2e/send-tokens.test.js |  5 -----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/network.test.js b/tests/e2e/network.test.js
index 7a46ffa5..b822f94d 100644
--- a/tests/e2e/network.test.js
+++ b/tests/e2e/network.test.js
@@ -26,6 +26,10 @@ const isCurrentNetworkMatch = async (page, network) => {
   expect(currentNetworkName).toBe(network);
 };
 
+const isTabDisabled = async (page, tab) => {
+  await page.waitForSelector(`[data-testid="tab-item-${tab}"][disabled]`);
+};
+
 describe('Network', () => {
   let browser;
   let page;
@@ -64,6 +68,8 @@ describe('Network', () => {
     { testId: networkInputHostErrorTestID, errorMessage: 'There is already a network with that host' },
   ];
 
+  const tabs = ['NFTs', 'Activity', 'Apps'];
+
   beforeAll(async () => {
     browser = await setupChrome();
 
@@ -125,12 +131,18 @@ describe('Network', () => {
     await page.waitForSelector('[data-testid="tab-item-NFTs"][disabled]');
     await isCurrentNetworkMatch(page, networkName);
     await page.waitForTestIdSelector('asset-name-XTC', { hidden: true });
+  });
 
-    // checking that the extension does not allow to add an existing network
-    await openSelectNetworkModalButtonClick(page, false);
+  test('checking that the extension does not allow to add an existing network', async () => {
     await popupPageUtils.addSonicNetwork(page);
     for (const data of inputsErrorsData2) {
       await isErrorMatch(page, data.testId, data.errorMessage);
     }
   });
+
+  test('checking that all tabs except the tokens tab are blocked ', async () => {
+    for (const data of tabs) {
+      await isTabDisabled(page, data);
+    }
+  });
 });
diff --git a/tests/e2e/send-tokens.test.js b/tests/e2e/send-tokens.test.js
index 49cdd77a..982354ee 100644
--- a/tests/e2e/send-tokens.test.js
+++ b/tests/e2e/send-tokens.test.js
@@ -14,8 +14,6 @@ const getAvailableAmount = async (page, shouldFormat = true) => {
 
   const availableAmountString = await page.evaluate((element) => element.innerText, availableAmountTag);
 
-  console.log('availableAmountString', availableAmountString);
-
   return shouldFormat ? formatTokenAmount(availableAmountString) : availableAmountString;
 };
 
@@ -121,7 +119,6 @@ const tokenBalanceCheck = async (page, { previousAmount, name }) => {
   const assetAmountString = await page.evaluate((element) => element.innerText, assetAmount);
 
   const newAmount = formatTokenAmount(assetAmountString);
-  console.log('newAmount', newAmount);
   const sentAmount = Number((previousAmount - newAmount).toFixed(4));
 
   expect(sentAmount).toBe(AMOUNT_TO_SEND);
@@ -349,7 +346,6 @@ describe('Send Custom Tokens', () => {
     for (const data of customTokenData) {
       await selectToken(page, data.name);
       const previousAmount = await getAvailableAmount(page);
-      console.log(customTokenData);
       await recipientPrincipalIdEnter(page);
       await sendToken(page, data.name);
       previousAmounts.push(previousAmount);
@@ -432,7 +428,6 @@ describe('Send Custom Tokens on Sonic Network', () => {
     for (const data of customTokenData) {
       await selectToken(page, data.name);
       const previousAmount = await getAvailableAmount(page);
-      console.log('pam', previousAmount);
       await recipientPrincipalIdEnter(page);
       await sendToken(page, data.name);
       previousAmounts.push(previousAmount);

From 4ef1a4d5bfb19b1e52586fab21d8e1eee66817f5 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 7 Sep 2022 10:26:23 -0300
Subject: [PATCH 020/132] show collections with 0 nfts without chevron - if the
 icon is null show a default image

---
 .../NFTs/components/NFTCollection/index.jsx     | 15 ++++++++++-----
 source/components/NFTs/index.jsx                | 17 ++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/source/components/NFTs/components/NFTCollection/index.jsx b/source/components/NFTs/components/NFTCollection/index.jsx
index af503542..868cf44e 100644
--- a/source/components/NFTs/components/NFTCollection/index.jsx
+++ b/source/components/NFTs/components/NFTCollection/index.jsx
@@ -10,6 +10,7 @@ import { shortICNSName } from '@shared/services/ICNS';
 import { useRouter } from '@components/Router';
 import { setSelectedNft } from '@redux/nfts';
 import { NFT_COLLECTION_DEFAULT_TYPES } from '@shared/constants/nft';
+import imageIcon from '@assets/icons/imageIcon.svg';
 import NFTDisplayer from '../../../NFTDisplayer';
 import ICNSDisplay from '../../../ICNSDisplay';
 
@@ -41,7 +42,7 @@ function NFTCollection({
             <div className={classes.iconContainer}>
               <img
                 loading="lazy"
-                src={collection?.icon}
+                src={collection?.icon ? collection?.icon : imageIcon}
                 className={clsx(classes.collectionIcon, icns && classes.icnsIcon)}
               />
             </div>
@@ -51,10 +52,14 @@ function NFTCollection({
             <p className={classes.nftQty}>
               {collection.tokens.length}
             </p>
-            <ChevronDown
-              className={clsx(classes.expandIcon, expanded && classes.rotate)}
-              size={20}
-            />
+            {
+              !!collection?.tokens.length && (
+                <ChevronDown
+                  className={clsx(classes.expandIcon, expanded && classes.rotate)}
+                  size={20}
+                />
+              )
+            }
           </div>
         </div>
         )}
diff --git a/source/components/NFTs/index.jsx b/source/components/NFTs/index.jsx
index d51a359a..5e1aabdc 100644
--- a/source/components/NFTs/index.jsx
+++ b/source/components/NFTs/index.jsx
@@ -41,15 +41,14 @@ const NFTs = () => {
           ? <EmptyState />
           : (
             <div className={classes.root}>
-              {collections.map((collection, index) => !!collection?.tokens?.length
-                && (
-                  <NFTCollection
-                    collection={collection}
-                    defaultOpen={index === 0}
-                    icns={collection?.name === 'ICNS'}
-                    collectionTestID="nft-collection-dropdown"
-                  />
-                ))}
+              {collections.map((collection, index) => (
+                <NFTCollection
+                  collection={collection}
+                  defaultOpen={index === 0}
+                  icns={collection?.name === 'ICNS'}
+                  collectionTestID="nft-collection-dropdown"
+                />
+              ))}
             </div>
           )
       }

From bebcdf7739f492e4820651c5aa905773e9b28a05 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 7 Sep 2022 10:29:36 -0300
Subject: [PATCH 021/132] change package.json and yarn.lock to upstream content

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

diff --git a/package.json b/package.json
index c675444e..078b4cb2 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/dab-js-test": "1.4.11",
-    "@psychedelic/plug-controller": "/Users/cancu/Dev/plug-controller",
+    "@psychedelic/plug-controller": "0.19.8",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 603a8e40..0d9f9cf9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1114,7 +1114,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1":
+"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1145,7 +1145,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/string-locale-compare@^1.0.1":
+"@isaacs/string-locale-compare@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -1589,64 +1589,71 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.8.3":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c"
-  integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA==
+"@npmcli/arborist@*", "@npmcli/arborist@^5.0.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.0.tgz#ace635279d0d548df164ac83464237fd5f0175ad"
+  integrity sha512-gM2AxWCaXTZRZnKOHT6uIUHTkvRf+UPU2iC/3nC1Bj21zemnoKyJh2NvcG69UCcfs+r1jpx6hZ0dL9s2yPssJQ==
   dependencies:
-    "@isaacs/string-locale-compare" "^1.0.1"
+    "@isaacs/string-locale-compare" "^1.1.0"
     "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/map-workspaces" "^1.0.2"
-    "@npmcli/metavuln-calculator" "^1.1.0"
-    "@npmcli/move-file" "^1.1.0"
+    "@npmcli/map-workspaces" "^2.0.3"
+    "@npmcli/metavuln-calculator" "^3.0.1"
+    "@npmcli/move-file" "^2.0.0"
     "@npmcli/name-from-folder" "^1.0.1"
-    "@npmcli/node-gyp" "^1.0.1"
-    "@npmcli/package-json" "^1.0.1"
-    "@npmcli/run-script" "^1.8.2"
-    bin-links "^2.2.1"
-    cacache "^15.0.3"
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/package-json" "^2.0.0"
+    "@npmcli/query" "^1.1.1"
+    "@npmcli/run-script" "^4.1.3"
+    bin-links "^3.0.0"
+    cacache "^16.0.6"
     common-ancestor-path "^1.0.1"
     json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
+    minimatch "^5.1.0"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
-    npm-install-checks "^4.0.0"
-    npm-package-arg "^8.1.5"
-    npm-pick-manifest "^6.1.0"
-    npm-registry-fetch "^11.0.0"
-    pacote "^11.3.5"
-    parse-conflict-json "^1.1.1"
-    proc-log "^1.0.0"
+    nopt "^6.0.0"
+    npm-install-checks "^5.0.0"
+    npm-package-arg "^9.0.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.0"
+    npmlog "^6.0.2"
+    pacote "^13.6.1"
+    parse-conflict-json "^2.0.1"
+    proc-log "^2.0.0"
     promise-all-reject-late "^1.0.0"
     promise-call-limit "^1.0.1"
     read-package-json-fast "^2.0.2"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.5"
-    ssri "^8.0.1"
-    treeverse "^1.0.4"
+    semver "^7.3.7"
+    ssri "^9.0.0"
+    treeverse "^2.0.0"
     walk-up-path "^1.0.0"
 
-"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
-  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
+"@npmcli/ci-detect@*", "@npmcli/ci-detect@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
+  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
 
-"@npmcli/config@^2.3.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.4.0.tgz#1447b0274f9502871dabd3ab1d8302472d515b1f"
-  integrity sha512-fwxu/zaZnvBJohXM3igzqa3P1IVYWi5N343XcKvKkJbAx+rTqegS5tAul4NLiMPQh6WoS5a4er6oo/ieUx1f4g==
+"@npmcli/config@*":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.2.1.tgz#7a4b46f4a315fe369a3f8543c67fae0b89549a40"
+  integrity sha512-iJEnXNAGGr7sGUcoKmeJNrc943vFiWrDWq6DNK/t+SuqoObmozMb3tN3G5T9yo3uBf5Cw4h+SWgoqSaiwczl0Q==
   dependencies:
-    ini "^2.0.0"
+    "@npmcli/map-workspaces" "^2.0.2"
+    ini "^3.0.0"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^5.0.0"
-    semver "^7.3.4"
+    nopt "^6.0.0"
+    proc-log "^2.0.0"
+    read-package-json-fast "^2.0.3"
+    semver "^7.3.5"
     walk-up-path "^1.0.0"
 
-"@npmcli/disparity-colors@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
-  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
+"@npmcli/disparity-colors@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
+  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
   dependencies:
     ansi-styles "^4.3.0"
 
@@ -1658,21 +1665,30 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
-  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
+"@npmcli/fs@^2.1.0", "@npmcli/fs@^2.1.1":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
+  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
   dependencies:
-    "@npmcli/promise-spawn" "^1.3.2"
-    lru-cache "^6.0.0"
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
+
+"@npmcli/git@^3.0.0":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931"
+  integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==
+  dependencies:
+    "@npmcli/promise-spawn" "^3.0.0"
+    lru-cache "^7.4.4"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^6.1.1"
+    npm-pick-manifest "^7.0.0"
+    proc-log "^2.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
+"@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -1680,26 +1696,27 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
-  integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
+"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
+  integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg==
   dependencies:
     "@npmcli/name-from-folder" "^1.0.1"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-    read-package-json-fast "^2.0.1"
+    glob "^8.0.1"
+    minimatch "^5.0.1"
+    read-package-json-fast "^2.0.3"
 
-"@npmcli/metavuln-calculator@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
-  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
+"@npmcli/metavuln-calculator@^3.0.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622"
+  integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA==
   dependencies:
-    cacache "^15.0.5"
-    pacote "^11.1.11"
-    semver "^7.3.2"
+    cacache "^16.0.0"
+    json-parse-even-better-errors "^2.3.1"
+    pacote "^13.0.3"
+    semver "^7.3.5"
 
-"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
+"@npmcli/move-file@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
@@ -1707,39 +1724,57 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
+"@npmcli/move-file@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
+  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
 "@npmcli/name-from-folder@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
   integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
-  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
+"@npmcli/node-gyp@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
+  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
 
-"@npmcli/package-json@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
-  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
+"@npmcli/package-json@*", "@npmcli/package-json@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
+  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
   dependencies:
     json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
-  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+"@npmcli/promise-spawn@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
+  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
-  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
+"@npmcli/query@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-1.1.1.tgz#462c4268473ae39e89d5fefbad94d9af7e1217c4"
+  integrity sha512-UF3I0fD94wzQ84vojMO2jDB8ibjRSTqhi8oz2mzVKiJ9gZHbeGlu9kzPvgHuGDK0Hf2cARhWtTfCDHNEwlL9hg==
   dependencies:
-    "@npmcli/node-gyp" "^1.0.2"
-    "@npmcli/promise-spawn" "^1.3.2"
-    node-gyp "^7.1.0"
-    read-package-json-fast "^2.0.1"
+    npm-package-arg "^9.1.0"
+    postcss-selector-parser "^6.0.10"
+    semver "^7.3.7"
+
+"@npmcli/run-script@*", "@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946"
+  integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==
+  dependencies:
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/promise-spawn" "^3.0.0"
+    node-gyp "^9.0.0"
+    read-package-json-fast "^2.0.3"
+    which "^2.0.2"
 
 "@psychedelic/browser-rpc@2.1.0":
   version "2.1.0"
@@ -1761,20 +1796,6 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js-test@1.4.11":
-  version "1.4.11"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js-test/1.4.11/e46210c7148fe9acfdf7192af3406d17ee87cd31#e46210c7148fe9acfdf7192af3406d17ee87cd31"
-  integrity sha512-6hi8AKA+VKN476Eo9UOV6hwhKdpLAmqe3P646ry9vJM/k9AY6+iHVDbpSOelW6IStDACDbsCugVjYSck0ojBgQ==
-  dependencies:
-    "@dfinity/agent" "0.9.3"
-    "@dfinity/candid" "0.9.3"
-    "@dfinity/identity" "0.9.3"
-    "@dfinity/principal" "0.9.3"
-    axios "^0.24.0"
-    buffer-crc32 "^0.2.13"
-    cross-fetch "^3.1.4"
-    crypto-js "^4.1.1"
-
 "@psychedelic/dab-js@1.4.5":
   version "1.4.5"
   resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.5/eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f#eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f"
@@ -1789,46 +1810,31 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@/Users/cancu/Dev/plug-controller":
-  version "0.19.8"
+"@psychedelic/dab-js@1.4.6":
+  version "1.4.6"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.6/8c06156d4c51634e2a35a837e3b89d18f246ce0e#8c06156d4c51634e2a35a837e3b89d18f246ce0e"
+  integrity sha512-p5MhoUikpqb+osqjg4dthiKFYt9X4EMKPOBbe6OD20iOxvmTIqQ3dqejwXSJO28ohFCnZseRG+UQsfoz+6jhTw==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
-    "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js-test" "1.4.11"
-    "@types/secp256k1" "^4.0.3"
-    axios "^0.21.1"
-    babel-jest "^25.5.1"
-    bigint-conversion "^2.2.1"
-    bip39 "^3.0.4"
+    axios "^0.24.0"
     buffer-crc32 "^0.2.13"
-    create-hmac "^1.1.7"
     cross-fetch "^3.1.4"
-    crypto-js "^4.0.0"
-    ed25519-hd-key "^1.2.0"
-    extensionizer "^1.0.1"
-    hdkey "^2.0.1"
-    js-sha256 "^0.9.0"
-    json-bigint "^1.0.0"
-    random-color "^1.0.1"
-    reflect-metadata "^0.1.13"
-    secp256k1 "^4.0.2"
-    text-encoding "^0.7.0"
-    text-encoding-shim "^1.0.5"
-    tweetnacl "^1.0.3"
-    uuidv4 "^6.2.13"
+    crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@file:../plug-controller":
+"@psychedelic/plug-controller@0.19.8":
   version "0.19.8"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.8/0d6ca60ad6449c0d20aa193e5d29dac578d2b941#0d6ca60ad6449c0d20aa193e5d29dac578d2b941"
+  integrity sha512-9Qe+p9m6Ju/Me73XrVYjlDbooRffW4O6fPTl3PIhWvApU22i9bdj7hak/1cC7e9qh5fwah4nk7r5k/avRgS71w==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js-test" "1.4.11"
+    "@psychedelic/dab-js" "1.4.6"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"
@@ -1923,6 +1929,11 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.1.19"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
@@ -2426,7 +2437,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1, abbrev@~1.1.1:
+abbrev@*, abbrev@1, abbrev@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2484,7 +2495,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.1.3:
+agentkeepalive@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -2511,7 +2522,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.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==
@@ -2548,7 +2559,7 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
+ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2582,12 +2593,12 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
   integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
 
-ansicolors@~0.3.2:
+ansicolors@*:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
 
-ansistyles@~0.1.3:
+ansistyles@*:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
   integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
@@ -2608,16 +2619,16 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
+aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 archiver-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
@@ -2647,27 +2658,19 @@ archiver@^5.3.0:
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
-archy@~1.0.0:
+archy@*:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
-are-we-there-yet@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
-  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
+are-we-there-yet@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
-are-we-there-yet@~1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
-  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2787,18 +2790,6 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, 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==
-
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2854,16 +2845,6 @@ autoprefixer@^10.0.2:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
 axe-core@^4.4.2:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
@@ -3679,13 +3660,6 @@ bash-path@^1.0.1:
     arr-union "^3.1.0"
     is-windows "^1.0.1"
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3703,17 +3677,17 @@ bignumber.js@^9.0.0:
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
   integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
 
-bin-links@^2.2.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967"
-  integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA==
+bin-links@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.2.tgz#5c40f14b0742faa2ae952caa76b4a29090befcbb"
+  integrity sha512-+oSWBdbCUK6X4LOCSrU36fWRzZNaK7/evX7GozR9xwl2dyiVi3UOUwTyyOVYI1FstgugfsM9QESRrWo7gjCYbg==
   dependencies:
-    cmd-shim "^4.0.1"
+    cmd-shim "^5.0.0"
     mkdirp-infer-owner "^2.0.0"
     npm-normalize-package-bin "^1.0.0"
-    read-cmd-shim "^2.0.0"
+    read-cmd-shim "^3.0.0"
     rimraf "^3.0.0"
-    write-file-atomic "^3.0.3"
+    write-file-atomic "^4.0.0"
 
 binary-extensions@^1.0.0:
   version "1.13.1"
@@ -3996,10 +3970,36 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
-builtins@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
+builtins@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
+
+cacache@*:
+  version "16.1.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
+  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^2.0.0"
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -4022,7 +4022,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
+cacache@^15.0.5:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -4046,6 +4046,30 @@ cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
+cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
+  version "16.1.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.2.tgz#a519519e9fc9e5e904575dcd3b77660cbf03f749"
+  integrity sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^1.1.1"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -4138,10 +4162,10 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+chalk@*:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
+  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
 
 chalk@^1.1.3:
   version "1.1.3"
@@ -4218,16 +4242,16 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chownr@*, chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 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==
 
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -4293,13 +4317,13 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-columns@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
-  integrity sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==
+cli-columns@*:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
+  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
   dependencies:
-    string-width "^2.0.0"
-    strip-ansi "^3.0.1"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -4308,7 +4332,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@^0.6.0:
+cli-table3@*:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
   integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
@@ -4381,10 +4405,10 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
-cmd-shim@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
-  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
+cmd-shim@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
+  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
@@ -4402,11 +4426,6 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
-
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4452,7 +4471,7 @@ color-string@1.5.5, color-string@^0.3.0, color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.2:
+color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -4484,15 +4503,15 @@ colors@1.4.0, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@~1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
-  integrity sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==
+columnify@*:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
+  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
   dependencies:
-    strip-ansi "^3.0.0"
+    strip-ansi "^6.0.1"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4586,7 +4605,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
+console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -4667,11 +4686,6 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-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==
-
 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"
@@ -5064,13 +5078,6 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5416,14 +5423,6 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ed25519-hd-key@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ed25519-hd-key/-/ed25519-hd-key-1.2.0.tgz#819d43c6a96477c9385bd121dccc94dbc6c6598c"
@@ -5491,7 +5490,7 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-encoding@^0.1.12:
+encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -6011,11 +6010,6 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
 extensionizer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/extensionizer/-/extensionizer-1.0.1.tgz#504544239a7610ba8404b15c1832091a37768d09"
@@ -6046,16 +6040,6 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-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==
-
 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"
@@ -6094,6 +6078,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fastest-levenshtein@*:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
 fastest-levenshtein@^1.0.12:
   version "1.0.14"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz#9054384e4b7a78c88d01a4432dc18871af0ac859"
@@ -6327,11 +6316,6 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -6341,15 +6325,6 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 fraction.js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
@@ -6454,34 +6429,19 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
-  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.2"
-    console-control-strings "^1.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
     has-unicode "^2.0.1"
-    object-assign "^4.1.1"
-    signal-exit "^3.0.0"
+    signal-exit "^3.0.7"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.2"
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+    wide-align "^1.1.5"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6539,13 +6499,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
 glob-parent@5.1.2, glob-parent@^3.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -6558,7 +6511,18 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
+glob@*, glob@^8.0.1:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
+glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6642,24 +6606,11 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.8, graceful-fs@^4.2.9:
+graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -6713,7 +6664,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.0, has-unicode@^2.0.1:
+has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
@@ -6815,12 +6766,12 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+hosted-git-info@*, hosted-git-info@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
+  integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
   dependencies:
-    lru-cache "^6.0.0"
+    lru-cache "^7.5.1"
 
 hsl-regex@^1.0.0:
   version "1.0.0"
@@ -6903,14 +6854,14 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -6995,12 +6946,12 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore-walk@^3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
-  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
+ignore-walk@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
+  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
   dependencies:
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
 
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
@@ -7084,28 +7035,33 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
+ini@*:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
+  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
+
 ini@^1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ini@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
-  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+ini@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1"
+  integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==
 
-init-package-json@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
-  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
+init-package-json@*:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
+  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
   dependencies:
-    npm-package-arg "^8.1.5"
+    npm-package-arg "^9.0.1"
     promzard "^0.3.0"
-    read "~1.0.1"
-    read-package-json "^4.1.1"
+    read "^1.0.7"
+    read-package-json "^5.0.0"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^3.0.0"
+    validate-npm-package-name "^4.0.0"
 
 internal-slot@^1.0.3:
   version "1.0.3"
@@ -7213,7 +7169,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@^4.0.2:
+is-cidr@*:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
   integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
@@ -7232,13 +7188,6 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.5.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
-  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
-  dependencies:
-    has "^1.0.3"
-
 is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -7307,18 +7256,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
 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"
@@ -7472,7 +7409,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -7526,11 +7463,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -8129,11 +8061,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
 jsconfig-paths-jest-mapper@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsconfig-paths-jest-mapper/-/jsconfig-paths-jest-mapper-1.0.0.tgz#cd8570e9f6eabb33890b27eb51bc7b6e91a8564e"
@@ -8196,7 +8123,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   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==
@@ -8211,11 +8138,6 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
-  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8226,11 +8148,6 @@ json-stringify-nice@^1.1.4:
   resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
   integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
 
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
-
 json-text-sequence@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2"
@@ -8264,16 +8181,6 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
 jss-plugin-camel-case@^10.5.1:
   version "10.9.0"
   resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
@@ -8357,15 +8264,15 @@ junk@^3.1.0:
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
-just-diff-apply@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
-  integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
+just-diff-apply@^5.2.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b"
+  integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g==
 
-just-diff@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
-  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
+just-diff@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202"
+  integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ==
 
 keycode@^2.1.7:
   version "2.2.1"
@@ -8471,115 +8378,118 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
-  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
+libnpmaccess@*:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded"
+  integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^8.1.2"
-    npm-registry-fetch "^11.0.0"
+    npm-package-arg "^9.0.1"
+    npm-registry-fetch "^13.0.0"
 
-libnpmdiff@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
-  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
+libnpmdiff@*:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.4.tgz#487ccb609dacd7f558f089feef3153933e157d02"
+  integrity sha512-bUz12309DdkeFL/K0sKhW1mbg8DARMbNI0vQKrJp1J8lxhxqkAjzSQ3eQCacFjSwCz4xaf630ogwuOkSt61ZEQ==
   dependencies:
-    "@npmcli/disparity-colors" "^1.0.1"
+    "@npmcli/disparity-colors" "^2.0.0"
     "@npmcli/installed-package-contents" "^1.0.7"
     binary-extensions "^2.2.0"
     diff "^5.0.0"
-    minimatch "^3.0.4"
-    npm-package-arg "^8.1.1"
-    pacote "^11.3.0"
+    minimatch "^5.0.1"
+    npm-package-arg "^9.0.1"
+    pacote "^13.6.1"
     tar "^6.1.0"
 
-libnpmexec@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
-  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
+libnpmexec@*:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.11.tgz#3307fd7b683630268237936a921f5faadd5bfaef"
+  integrity sha512-uhkAWVT0pA1kVgqgTjIMVebOPl3PpIvVcRQ1IBV47ppVxmQr+JCjDahrV0K/0JUsKSVFozyGEEmg1Kz0HwRwzw==
   dependencies:
-    "@npmcli/arborist" "^2.3.0"
-    "@npmcli/ci-detect" "^1.3.0"
-    "@npmcli/run-script" "^1.8.4"
+    "@npmcli/arborist" "^5.0.0"
+    "@npmcli/ci-detect" "^2.0.0"
+    "@npmcli/fs" "^2.1.1"
+    "@npmcli/run-script" "^4.2.0"
     chalk "^4.1.0"
     mkdirp-infer-owner "^2.0.0"
-    npm-package-arg "^8.1.2"
-    pacote "^11.3.1"
-    proc-log "^1.0.0"
+    npm-package-arg "^9.0.1"
+    npmlog "^6.0.2"
+    pacote "^13.6.1"
+    proc-log "^2.0.0"
     read "^1.0.7"
     read-package-json-fast "^2.0.2"
+    semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
-  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
+libnpmfund@*:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.2.tgz#7da0827950f0db2cce0acb0dc7652d1834a8b239"
+  integrity sha512-wmFMP/93Wjy+jDg5LaSldDgAhSgCyA64JUUmp806Kae7y3YP9Qv5m1vUhPxT4yebxgB2v/I6G1/RUcNb1y0kVg==
   dependencies:
-    "@npmcli/arborist" "^2.5.0"
+    "@npmcli/arborist" "^5.0.0"
 
-libnpmhook@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30"
-  integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==
+libnpmhook@*:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.3.tgz#9628518a63455d21dafda312ee46175275707ff5"
+  integrity sha512-TEdNI1mC5zS+w/juCgxrwwQnpbq9lY76NDOS0N37pn6pWIUxB1Yq8mwy6MUEXR1TgH4HurSQyKT6I6Kp9Wjm4A==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^11.0.0"
+    npm-registry-fetch "^13.0.0"
 
-libnpmorg@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc"
-  integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==
+libnpmorg@*:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.3.tgz#a85cbdb3665ad4f7c7279d239a4581ec2eeef5a6"
+  integrity sha512-r4CpmCEF+e5PbFMBi64xSXmqn0uGgV4T7NWpGL4/A6KT/DTtIxALILQZq+l0ZdN1xm4RjOvqSDR22oT4il8rAQ==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^11.0.0"
+    npm-registry-fetch "^13.0.0"
 
-libnpmpack@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
-  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
+libnpmpack@*:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.1.2.tgz#9234a3b1ae433f922c19e97cd3a8a0b135b5f4cc"
+  integrity sha512-megSAPeZGv9jnDM4KovKbczjyuy/EcPxCIU/iaWsDU1IEAVtBJ0qHqNUm5yN2AgN501Tb3CL6KeFGYdG4E31rQ==
   dependencies:
-    "@npmcli/run-script" "^1.8.3"
-    npm-package-arg "^8.1.0"
-    pacote "^11.2.6"
+    "@npmcli/run-script" "^4.1.3"
+    npm-package-arg "^9.0.1"
+    pacote "^13.6.1"
 
-libnpmpublish@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
-  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
+libnpmpublish@*:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.4.tgz#adb41ec6b0c307d6f603746a4d929dcefb8f1a0b"
+  integrity sha512-lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg==
   dependencies:
-    normalize-package-data "^3.0.2"
-    npm-package-arg "^8.1.2"
-    npm-registry-fetch "^11.0.0"
-    semver "^7.1.3"
-    ssri "^8.0.1"
+    normalize-package-data "^4.0.0"
+    npm-package-arg "^9.0.1"
+    npm-registry-fetch "^13.0.0"
+    semver "^7.3.7"
+    ssri "^9.0.0"
 
-libnpmsearch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3"
-  integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==
+libnpmsearch@*:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.3.tgz#ed502a4c2c70ea36723180455fae1357546b2184"
+  integrity sha512-Ofq76qKAPhxbiyzPf/5LPjJln26VTKwU9hIU0ACxQ6tNtBJ1CHmI7iITrdp7vNezhZc0FlkXwrIpqXjhBJZgLQ==
   dependencies:
-    npm-registry-fetch "^11.0.0"
+    npm-registry-fetch "^13.0.0"
 
-libnpmteam@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c"
-  integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==
+libnpmteam@*:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.3.tgz#9335fbbd032b3770f5c9b7ffc6203f47d1ed144a"
+  integrity sha512-LsYYLz4TlTpcqkusInY5MhKjiHFaCx1GV0LmydXJ/QMh+3IWBJpUhes4ynTZuFoJKkDIFjxyMU09ul+RZixgdg==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^11.0.0"
+    npm-registry-fetch "^13.0.0"
 
-libnpmversion@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9"
-  integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==
+libnpmversion@*:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.6.tgz#a4a476d38a44d38db9ac424a5e7334479e7fb8b9"
+  integrity sha512-+lI+AO7cZwDxyAeWCIR8+n9XEfgSDAqmNbv4zy+H6onGthsk/+E3aa+5zIeBpyG5g268zjpc0qrBch0Q3w0nBA==
   dependencies:
-    "@npmcli/git" "^2.0.7"
-    "@npmcli/run-script" "^1.8.4"
+    "@npmcli/git" "^3.0.0"
+    "@npmcli/run-script" "^4.1.3"
     json-parse-even-better-errors "^2.3.1"
-    semver "^7.3.5"
-    stringify-package "^1.0.1"
+    proc-log "^2.0.0"
+    semver "^7.3.7"
 
 lilconfig@2.0.5:
   version "2.0.5"
@@ -8797,6 +8707,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
+  integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
+
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -8812,27 +8727,27 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
+make-fetch-happen@*, make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
+  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
   dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
+    agentkeepalive "^4.2.1"
+    cacache "^16.1.0"
     http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
+    http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
     minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
+    minipass-fetch "^2.0.3"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
+    negotiator "^0.6.3"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
+    socks-proxy-agent "^7.0.0"
+    ssri "^9.0.0"
 
 makeerror@1.0.12:
   version "1.0.12"
@@ -8947,7 +8862,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@~2.1.19:
+mime-types@^2.1.12:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8990,7 +8905,7 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.1.0:
+minimatch@^5.0.1, minimatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
@@ -9009,16 +8924,16 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
+minipass-fetch@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
+  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
   dependencies:
-    minipass "^3.1.0"
+    minipass "^3.1.6"
     minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
+    minizlib "^2.1.2"
   optionalDependencies:
-    encoding "^0.1.12"
+    encoding "^0.1.13"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
@@ -9035,7 +8950,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -9049,14 +8964,14 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
+minipass@*, minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
   integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.0.0, minizlib@^2.1.1:
+minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -9101,7 +9016,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp-infer-owner@^2.0.0:
+mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -9110,6 +9025,11 @@ mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
+mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -9117,11 +9037,6 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 moment@^2.29.1:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -9139,6 +9054,11 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+ms@*, ms@^2.0.0, ms@^2.1.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9149,11 +9069,6 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -9191,7 +9106,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.2:
+negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9248,20 +9163,20 @@ node-gyp-build@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
   integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
 
-node-gyp@^7.1.0, node-gyp@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
-  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+node-gyp@*, node-gyp@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
+  integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.3"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
     nopt "^5.0.0"
-    npmlog "^4.1.2"
-    request "^2.88.2"
+    npmlog "^6.0.0"
     rimraf "^3.0.2"
-    semver "^7.3.2"
-    tar "^6.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -9303,6 +9218,13 @@ node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
+nopt@*, nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -9310,15 +9232,15 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
-  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+normalize-package-data@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
+  integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==
   dependencies:
-    hosted-git-info "^4.0.1"
-    is-core-module "^2.5.0"
-    semver "^7.3.4"
-    validate-npm-package-license "^3.0.1"
+    hosted-git-info "^5.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -9342,24 +9264,24 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-audit-report@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
-  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
+npm-audit-report@*:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
+  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
   dependencies:
     chalk "^4.0.0"
 
-npm-bundled@^1.1.1:
+npm-bundled@^1.1.1, npm-bundled@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
-  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+npm-install-checks@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
+  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
   dependencies:
     semver "^7.1.1"
 
@@ -9368,53 +9290,61 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
-  version "8.1.5"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
-  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+npm-normalize-package-bin@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff"
+  integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==
+
+npm-package-arg@*, npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
+  integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
   dependencies:
-    hosted-git-info "^4.0.1"
-    semver "^7.3.4"
-    validate-npm-package-name "^3.0.0"
+    hosted-git-info "^5.0.0"
+    proc-log "^2.0.1"
+    semver "^7.3.5"
+    validate-npm-package-name "^4.0.0"
 
-npm-packlist@^2.1.4:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
-  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
+npm-packlist@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
+  integrity sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==
   dependencies:
-    glob "^7.1.6"
-    ignore-walk "^3.0.3"
-    npm-bundled "^1.1.1"
+    glob "^8.0.1"
+    ignore-walk "^5.0.1"
+    npm-bundled "^1.1.2"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
-  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
+npm-pick-manifest@*, npm-pick-manifest@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
+  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
   dependencies:
-    npm-install-checks "^4.0.0"
+    npm-install-checks "^5.0.0"
     npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^8.1.2"
-    semver "^7.3.4"
+    npm-package-arg "^9.0.0"
+    semver "^7.3.5"
 
-npm-profile@^5.0.3:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
-  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
+npm-profile@*:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.2.1.tgz#975c31ec75a6ae029ab5b8820ffdcbae3a1e3d5e"
+  integrity sha512-Tlu13duByHyDd4Xy0PgroxzxnBYWbGGL5aZifNp8cx2DxUrHSoETXtPKg38aRPsBWMRfDtvcvVfJNasj7oImQQ==
   dependencies:
-    npm-registry-fetch "^11.0.0"
+    npm-registry-fetch "^13.0.1"
+    proc-log "^2.0.0"
 
-npm-registry-fetch@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
-  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
+npm-registry-fetch@*, npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
+  integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
   dependencies:
-    make-fetch-happen "^9.0.1"
-    minipass "^3.1.3"
-    minipass-fetch "^1.3.0"
+    make-fetch-happen "^10.0.6"
+    minipass "^3.1.6"
+    minipass-fetch "^2.0.3"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.0.0"
-    npm-package-arg "^8.0.0"
+    minizlib "^2.1.2"
+    npm-package-arg "^9.0.1"
+    proc-log "^2.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -9437,7 +9367,7 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@^1.0.1:
+npm-user-validate@*:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
@@ -9516,24 +9446,14 @@ npm@7.22.0:
     which "^2.0.2"
     write-file-atomic "^3.0.3"
 
-npmlog@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-npmlog@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
-  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
+npmlog@*, npmlog@^6.0.0, npmlog@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
   dependencies:
-    are-we-there-yet "^2.0.0"
+    are-we-there-yet "^3.0.0"
     console-control-strings "^1.1.0"
-    gauge "^3.0.0"
+    gauge "^4.0.3"
     set-blocking "^2.0.0"
 
 nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
@@ -9543,21 +9463,11 @@ nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
-
 nwsapi@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
   integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -9672,7 +9582,7 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-opener@^1.5.2:
+opener@*:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -9835,30 +9745,32 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5:
-  version "11.3.5"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
-  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
+pacote@*, pacote@^13.0.3, pacote@^13.6.1:
+  version "13.6.2"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
+  integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==
   dependencies:
-    "@npmcli/git" "^2.1.0"
-    "@npmcli/installed-package-contents" "^1.0.6"
-    "@npmcli/promise-spawn" "^1.2.0"
-    "@npmcli/run-script" "^1.8.2"
-    cacache "^15.0.5"
+    "@npmcli/git" "^3.0.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/promise-spawn" "^3.0.0"
+    "@npmcli/run-script" "^4.1.0"
+    cacache "^16.0.0"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.3"
-    mkdirp "^1.0.3"
-    npm-package-arg "^8.0.1"
-    npm-packlist "^2.1.4"
-    npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^11.0.0"
+    minipass "^3.1.6"
+    mkdirp "^1.0.4"
+    npm-package-arg "^9.0.0"
+    npm-packlist "^5.1.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.1"
+    proc-log "^2.0.0"
     promise-retry "^2.0.1"
-    read-package-json-fast "^2.0.1"
+    read-package-json "^5.0.0"
+    read-package-json-fast "^2.0.3"
     rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.1.0"
+    ssri "^9.0.0"
+    tar "^6.1.11"
 
 pako@~1.0.5:
   version "1.0.11"
@@ -9900,14 +9812,14 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-conflict-json@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
-  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
+parse-conflict-json@*, parse-conflict-json@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
+  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
   dependencies:
-    json-parse-even-better-errors "^2.3.0"
-    just-diff "^3.0.1"
-    just-diff-apply "^3.0.0"
+    json-parse-even-better-errors "^2.3.1"
+    just-diff "^5.0.1"
+    just-diff-apply "^5.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -10031,11 +9943,6 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -10400,7 +10307,7 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10509,10 +10416,10 @@ private@^0.1.6:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-proc-log@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
-  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==
+proc-log@^2.0.0, proc-log@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -10603,7 +10510,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -10688,7 +10595,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qrcode-terminal@^0.12.0:
+qrcode-terminal@*:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -10703,11 +10610,6 @@ qrcode@^1.4.4:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
 query-string@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
@@ -10940,12 +10842,12 @@ react@^17.0.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-cmd-shim@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
-  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
+read-cmd-shim@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087"
+  integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==
 
-read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10953,24 +10855,34 @@ read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
-  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
+read-package-json@*:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa"
+  integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q==
   dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^3.0.0"
-    npm-normalize-package-bin "^1.0.0"
+    glob "^8.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    normalize-package-data "^4.0.0"
+    npm-normalize-package-bin "^2.0.0"
+
+read-package-json@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
+  integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
+  dependencies:
+    glob "^8.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    normalize-package-data "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
 
-read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
+read@*, read@1, read@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   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==
@@ -11012,7 +10924,7 @@ readdir-glob@^1.0.0:
   dependencies:
     minimatch "^5.1.0"
 
-readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -11213,32 +11125,6 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
-request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -11384,7 +11270,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@*, rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -11449,7 +11335,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -11525,6 +11411,13 @@ secp256k1@^4.0.0, secp256k1@^4.0.2:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
+semver@*, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -11540,13 +11433,6 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -11561,7 +11447,7 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -11734,10 +11620,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
-  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
@@ -11865,20 +11751,12 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
+ssri@*, ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+  dependencies:
+    minipass "^3.1.1"
 
 ssri@^6.0.1:
   version "6.0.2"
@@ -11887,7 +11765,7 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.0, ssri@^8.0.1:
+ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -11964,15 +11842,6 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11982,14 +11851,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
 string-width@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -12052,11 +11913,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-package@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
-  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -12064,13 +11920,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -12251,7 +12100,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.11:
+tar@*, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12339,7 +12188,7 @@ text-encoding@^0.7.0:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
   integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@*, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -12369,7 +12218,7 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
-tiny-relative-date@^1.3.0:
+tiny-relative-date@*:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -12447,14 +12296,6 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -12472,10 +12313,10 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
-  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
+treeverse@*, treeverse@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
+  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
@@ -12497,23 +12338,11 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
-
 tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -12638,7 +12467,14 @@ unique-filename@^1.1.1:
   dependencies:
     unique-slug "^2.0.0"
 
-unique-slug@^2.0.0:
+unique-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.0.tgz#c844c84c3b22e92038b0c53950f9dc34d2b55490"
+  integrity sha512-tpzoz2RpZ//6Zt4GPpOFTyrnfZuSvjIfe8lvx6Thp4yTQwJtAFwPlssEBE62VhGA2We5/COyNpcIu+OABu3/Yg==
+  dependencies:
+    unique-slug "^2.0.2"
+
+unique-slug@^2.0.0, unique-slug@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
   integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
@@ -12785,11 +12621,6 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
 uuidv4@^6.2.13:
   version "6.2.13"
   resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-6.2.13.tgz#8f95ec5ef22d1f92c8e5d4c70b735d1c89572cb7"
@@ -12812,7 +12643,7 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
 
-validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
+validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -12820,27 +12651,18 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
+validate-npm-package-name@*, validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
   dependencies:
-    builtins "^1.0.3"
+    builtins "^5.0.0"
 
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -13083,6 +12905,13 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
+which@*, which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^1.2.12, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -13090,14 +12919,7 @@ which@^1.2.12, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0, wide-align@^1.1.2:
+wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -13144,7 +12966,15 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
+write-file-atomic@*, write-file-atomic@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
+write-file-atomic@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -13308,4 +13138,4 @@ zip-stream@^4.1.0:
   dependencies:
     archiver-utils "^2.1.0"
     compress-commons "^4.1.0"
-    readable-stream "^3.6.0"
+    readable-stream "^3.6.0"
\ No newline at end of file

From 9da41f16e4060cb999df6e2f5fc82a90330147e0 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 7 Sep 2022 11:44:45 -0300
Subject: [PATCH 022/132] few console logs removed, text and state names

---
 package.json                                              | 2 +-
 source/Background/Keyring/index.js                        | 3 ---
 .../components/Tokens/components/TokenSelector/index.jsx  | 7 +++++--
 source/components/Tokens/index.jsx                        | 8 ++++----
 source/views/Extension/Views/AddNFT/Steps/Step2.jsx       | 3 ---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 078b4cb2..7d2d5711 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.8",
+    "@psychedelic/plug-controller": "0.20.0",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index b539b44f..a17a054d 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -206,12 +206,10 @@ export const getKeyringHandler = (type, keyring) => ({
     return parsed;
   },
   [HANDLER_TYPES.GET_ASSETS]: async ({ refresh }) => {
-    console.log('se activa get assets!');
     try {
       if (!keyring?.isUnlocked) return {};
 
       const { wallets, currentWalletId } = await keyring.getState();
-      console.log('el keyring getState me devuelve', wallets, currentWalletId);
       let assets = Object.values(wallets?.[currentWalletId]?.assets);
       const shouldUpdate = Object.values(assets)?.every((asset) => !Number(asset.amount))
         || Object.values(assets)?.some((asset) => asset.amount === 'Error')
@@ -305,7 +303,6 @@ export const getKeyringHandler = (type, keyring) => ({
         const nfts = await keyring.registerNFT({
           canisterId, standard,
         });
-        console.log('desde plug luego de llamar a registerNFT del keyring ->', nfts);
         return (nfts || []).map((nft) => recursiveParseBigint(nft));
       } catch (e) {
         // eslint-disable-next-line
diff --git a/source/components/Tokens/components/TokenSelector/index.jsx b/source/components/Tokens/components/TokenSelector/index.jsx
index 0f2bf784..bc463319 100644
--- a/source/components/Tokens/components/TokenSelector/index.jsx
+++ b/source/components/Tokens/components/TokenSelector/index.jsx
@@ -2,6 +2,7 @@ import React from 'react';
 import coins from '@assets/icons/coins.svg';
 import imageIcon from '@assets/icons/imageIcon.svg';
 import { useRouter } from '@components/Router';
+import { useTranslation } from 'react-i18next';
 import { Typography } from '@material-ui/core';
 import useStyles from './styles';
 
@@ -9,6 +10,8 @@ import useStyles from './styles';
 const TokenSelector = ({ onClose }) => {
   const classes = useStyles();
   const { navigator } = useRouter();
+  const { t } = useTranslation();
+
   return (
     <>
       <div
@@ -19,7 +22,7 @@ const TokenSelector = ({ onClose }) => {
         <img
           src={coins}
           alt="reload"
-        />  <Typography variant="h5" data-testid="wallet-name">Add Token</Typography>
+        />  <Typography variant="h5" data-testid="wallet-name">{t('addToken.title')}</Typography>
       </div>
       <div
         onClick={() => navigator.navigate('add-nft')}
@@ -30,7 +33,7 @@ const TokenSelector = ({ onClose }) => {
           src={imageIcon}
           alt="reload"
         />
-        <Typography variant="h5" data-testid="wallet-name">Add NFT</Typography>
+        <Typography variant="h5" data-testid="wallet-name">{t('addNFT.title')}</Typography>
       </div>
       <div className={classes.background} onClick={onClose} />
     </>
diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index 2a788130..9d16beac 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -20,7 +20,7 @@ const Tokens = () => {
   const dispatch = useDispatch();
   const icpPrice = useICPPrice();
   const { onScroll, fullScroll } = useScroll();
-  const [activateButton, setActivateButton] = useState(false);
+  const [displayCustomToken, setDisplayCustomToken] = useState(false);
 
   const fetchAssets = () => {
     sendMessage({
@@ -75,12 +75,12 @@ const Tokens = () => {
         <div className={classes.emptyAsset} />
       </div>
       {
-        activateButton && (
-          <TokenSelector onClose={() => setActivateButton(false)} />
+        displayCustomToken && (
+          <TokenSelector onClose={() => setDisplayCustomToken(false)} />
         )
       }
       <div
-        onClick={() => setActivateButton(!activateButton)}
+        onClick={() => setDisplayCustomToken(!displayCustomToken)}
         className={classes.buttonWrapper}
         data-testid="add-custom-token-button"
       >
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
index 1badbe04..696be489 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -23,13 +23,11 @@ const Step2 = ({ selectedToken, handleClose }) => {
   const classes = useStyles();
   const dispatch = useDispatch();
   const [loading, setLoading] = useState(false);
-  // const displayToken = parseTokenBySymbol(selectedToken); // podemos agregar un parser para terminar con el ultimo objeto
 
   const { principalId } = useSelector((state) => state.wallet);
 
   const registerToken = () => {
     setLoading(true);
-    console.log('el selected token es ->', selectedToken);
     sendMessage({
       type: HANDLER_TYPES.ADD_CUSTOM_NFT,
       params: selectedToken,
@@ -39,7 +37,6 @@ const Step2 = ({ selectedToken, handleClose }) => {
         params: { refresh: true },
       },
         (nftCollections) => {
-          console.log('luego del getNFTS me da estas collections', nftCollections);
           if (nftCollections?.length) {
             dispatch(setCollections({ collections: nftCollections, principalId }));
           }

From a32e7a4eb8e054c95a3b19037e5428979053eda2 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 7 Sep 2022 11:46:59 -0300
Subject: [PATCH 023/132] yarn lock updated to release yarn lock

---
 yarn.lock | 2119 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 1115 insertions(+), 1004 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0d9f9cf9..76b9d77c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24,26 +24,26 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
-  integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483"
+  integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==
 
 "@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.15.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.9.tgz#805461f967c77ff46c74ca0460ccf4fe933ddd59"
-  integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.13.tgz#9be8c44512751b05094a4d3ab05fc53a47ce00ac"
+  integrity sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
+    "@babel/generator" "^7.18.13"
     "@babel/helper-compilation-targets" "^7.18.9"
     "@babel/helper-module-transforms" "^7.18.9"
     "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.9"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/parser" "^7.18.13"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.18.13"
+    "@babel/types" "^7.18.13"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -59,12 +59,12 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.18.9", "@babel/generator@^7.7.2":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.9.tgz#68337e9ea8044d6ddc690fb29acae39359cca0a5"
-  integrity sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==
+"@babel/generator@^7.18.13", "@babel/generator@^7.7.2":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212"
+  integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
   dependencies:
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.18.13"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
@@ -83,7 +83,7 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.18.9":
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
   integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
@@ -94,9 +94,9 @@
     semver "^6.3.0"
 
 "@babel/helper-create-class-features-plugin@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce"
-  integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz#63e771187bd06d234f95fdf8bd5f8b6429de6298"
+  integrity sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -114,21 +114,19 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
-  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+"@babel/helper-define-polyfill-provider@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
+  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.6", "@babel/helper-environment-visitor@^7.18.9":
+"@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
@@ -162,7 +160,7 @@
   dependencies:
     "@babel/types" "^7.18.9"
 
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6":
+"@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
@@ -190,12 +188,12 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
   integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
 
-"@babel/helper-remap-async-to-generator@^7.18.6":
+"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
   integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
@@ -237,6 +235,11 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-string-parser@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
+  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+
 "@babel/helper-validator-identifier@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
@@ -248,14 +251,14 @@
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
 "@babel/helper-wrap-function@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.9.tgz#ae1feddc6ebbaa2fd79346b77821c3bd73a39646"
-  integrity sha512-cG2ru3TRAL6a60tfQflpEfs4ldiPwF6YW3zfJiRgmoFVIaC1vGnBBgatfec+ZUziPHkHSaXAuEck3Cdkf3eRpQ==
+  version "7.18.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb"
+  integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==
   dependencies:
     "@babel/helper-function-name" "^7.18.9"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.18.11"
+    "@babel/types" "^7.18.10"
 
 "@babel/helpers@^7.18.9":
   version "7.18.9"
@@ -275,10 +278,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.6", "@babel/parser@^7.18.9", "@babel/parser@^7.7.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539"
-  integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.10", "@babel/parser@^7.18.13", "@babel/parser@^7.7.0":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
+  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
@@ -296,14 +299,14 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz#aedac81e6fc12bb643374656dd5f2605bf743d17"
-  integrity sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==
+"@babel/plugin-proposal-async-generator-functions@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
+  integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-remap-async-to-generator" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.18.6":
@@ -610,9 +613,9 @@
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz#68906549c021cb231bee1db21d3b5b095f8ee292"
-  integrity sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5"
+  integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
@@ -759,15 +762,15 @@
     "@babel/plugin-transform-react-jsx" "^7.18.6"
 
 "@babel/plugin-transform-react-jsx@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.6.tgz#2721e96d31df96e3b7ad48ff446995d26bc028ff"
-  integrity sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz#ea47b2c4197102c196cbd10db9b3bb20daa820f1"
+  integrity sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-jsx" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.18.10"
 
 "@babel/plugin-transform-react-pure-annotations@^7.18.6":
   version "7.18.6"
@@ -793,15 +796,15 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-runtime@^7.12.1":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.9.tgz#d9e4b1b25719307bfafbf43065ed7fb3a83adb8f"
-  integrity sha512-wS8uJwBt7/b/mzE13ktsJdmS4JP/j7PQSaADtnb4I2wL0zK51MQ0pmF8/Jy0wUIS96fr+fXT6S/ifiPXnvrlSg==
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f"
+  integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.9"
-    babel-plugin-polyfill-corejs2 "^0.3.1"
-    babel-plugin-polyfill-corejs3 "^0.5.2"
-    babel-plugin-polyfill-regenerator "^0.3.1"
+    babel-plugin-polyfill-corejs2 "^0.3.2"
+    babel-plugin-polyfill-corejs3 "^0.5.3"
+    babel-plugin-polyfill-regenerator "^0.4.0"
     semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.18.6":
@@ -840,12 +843,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz#0d01fb7fb2243ae1c033f65f6e3b4be78db75f27"
-  integrity sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-unicode-regex@^7.18.6":
   version "7.18.6"
@@ -856,9 +859,9 @@
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/preset-env@^7.12.1":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.9.tgz#9b3425140d724fbe590322017466580844c7eaff"
-  integrity sha512-75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg==
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
+  integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
   dependencies:
     "@babel/compat-data" "^7.18.8"
     "@babel/helper-compilation-targets" "^7.18.9"
@@ -866,7 +869,7 @@
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.18.6"
+    "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
     "@babel/plugin-proposal-class-properties" "^7.18.6"
     "@babel/plugin-proposal-class-static-block" "^7.18.6"
     "@babel/plugin-proposal-dynamic-import" "^7.18.6"
@@ -926,13 +929,13 @@
     "@babel/plugin-transform-sticky-regex" "^7.18.6"
     "@babel/plugin-transform-template-literals" "^7.18.9"
     "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.6"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
     "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.9"
-    babel-plugin-polyfill-corejs2 "^0.3.1"
-    babel-plugin-polyfill-corejs3 "^0.5.2"
-    babel-plugin-polyfill-regenerator "^0.3.1"
+    "@babel/types" "^7.18.10"
+    babel-plugin-polyfill-corejs2 "^0.3.2"
+    babel-plugin-polyfill-corejs3 "^0.5.3"
+    babel-plugin-polyfill-regenerator "^0.4.0"
     core-js-compat "^3.22.1"
     semver "^6.3.0"
 
@@ -974,43 +977,44 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
   integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.18.6", "@babel/template@^7.3.3":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.6.tgz#1283f4993e00b929d6e2d3c72fdc9168a2977a31"
-  integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
+"@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.6"
-    "@babel/types" "^7.18.6"
+    "@babel/parser" "^7.18.10"
+    "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98"
-  integrity sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.13", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68"
+  integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
+    "@babel/generator" "^7.18.13"
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-function-name" "^7.18.9"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/parser" "^7.18.13"
+    "@babel/types" "^7.18.13"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.9.tgz#7148d64ba133d8d73a41b3172ac4b83a1452205f"
-  integrity sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==
+"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
+  integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
   dependencies:
+    "@babel/helper-string-parser" "^7.18.10"
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
@@ -1114,7 +1118,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1145,7 +1149,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/string-locale-compare@^1.1.0":
+"@isaacs/string-locale-compare@^1.0.1":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -1465,17 +1469,17 @@
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
-  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
+  integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@juanelas/base64@^1.0.1":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@juanelas/base64/-/base64-1.0.4.tgz#e457b9e8e10170f3d2ad685b7a82655bc4397c8b"
-  integrity sha512-KUidDSb+K7Rkoy2uJ/HdCnt4soNRlhNXONU8r8Cgic6Qq3E9BPg4kMSYXchM37WpYvGEGq2NUq/kCegMSLhtIg==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@juanelas/base64/-/base64-1.0.5.tgz#abbda3f529947b4d9784619c4fa039a3f9b58399"
+  integrity sha512-gTIElNo4ohMcYUZzol/Hb6DYJzphxl0b1B4egJJ+JiqxqcOcWx4XLMAB+lhWuMsMX3uR1oc5hwPusU3lgc1FkQ==
 
 "@material-ui/core@^4.11.3":
   version "4.12.4"
@@ -1589,71 +1593,64 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@*", "@npmcli/arborist@^5.0.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.0.tgz#ace635279d0d548df164ac83464237fd5f0175ad"
-  integrity sha512-gM2AxWCaXTZRZnKOHT6uIUHTkvRf+UPU2iC/3nC1Bj21zemnoKyJh2NvcG69UCcfs+r1jpx6hZ0dL9s2yPssJQ==
+"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.8.3":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c"
+  integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA==
   dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
+    "@isaacs/string-locale-compare" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/map-workspaces" "^2.0.3"
-    "@npmcli/metavuln-calculator" "^3.0.1"
-    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/map-workspaces" "^1.0.2"
+    "@npmcli/metavuln-calculator" "^1.1.0"
+    "@npmcli/move-file" "^1.1.0"
     "@npmcli/name-from-folder" "^1.0.1"
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/query" "^1.1.1"
-    "@npmcli/run-script" "^4.1.3"
-    bin-links "^3.0.0"
-    cacache "^16.0.6"
+    "@npmcli/node-gyp" "^1.0.1"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.2"
+    bin-links "^2.2.1"
+    cacache "^15.0.3"
     common-ancestor-path "^1.0.1"
     json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
-    minimatch "^5.1.0"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.0"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    parse-conflict-json "^2.0.1"
-    proc-log "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.0"
+    npm-registry-fetch "^11.0.0"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
+    proc-log "^1.0.0"
     promise-all-reject-late "^1.0.0"
     promise-call-limit "^1.0.1"
     read-package-json-fast "^2.0.2"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.7"
-    ssri "^9.0.0"
-    treeverse "^2.0.0"
+    semver "^7.3.5"
+    ssri "^8.0.1"
+    treeverse "^1.0.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/ci-detect@*", "@npmcli/ci-detect@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
-  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
+"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
+  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
 
-"@npmcli/config@*":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.2.1.tgz#7a4b46f4a315fe369a3f8543c67fae0b89549a40"
-  integrity sha512-iJEnXNAGGr7sGUcoKmeJNrc943vFiWrDWq6DNK/t+SuqoObmozMb3tN3G5T9yo3uBf5Cw4h+SWgoqSaiwczl0Q==
+"@npmcli/config@^2.3.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.4.0.tgz#1447b0274f9502871dabd3ab1d8302472d515b1f"
+  integrity sha512-fwxu/zaZnvBJohXM3igzqa3P1IVYWi5N343XcKvKkJbAx+rTqegS5tAul4NLiMPQh6WoS5a4er6oo/ieUx1f4g==
   dependencies:
-    "@npmcli/map-workspaces" "^2.0.2"
-    ini "^3.0.0"
+    ini "^2.0.0"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    proc-log "^2.0.0"
-    read-package-json-fast "^2.0.3"
-    semver "^7.3.5"
+    nopt "^5.0.0"
+    semver "^7.3.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/disparity-colors@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
-  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
+"@npmcli/disparity-colors@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
+  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
   dependencies:
     ansi-styles "^4.3.0"
 
@@ -1665,30 +1662,21 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/fs@^2.1.0", "@npmcli/fs@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/git@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931"
-  integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==
+"@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
-    "@npmcli/promise-spawn" "^3.0.0"
-    lru-cache "^7.4.4"
+    "@npmcli/promise-spawn" "^1.3.2"
+    lru-cache "^6.0.0"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^7.0.0"
-    proc-log "^2.0.0"
+    npm-pick-manifest "^6.1.1"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.7":
+"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -1696,27 +1684,26 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
-  integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg==
+"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
+  integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
   dependencies:
     "@npmcli/name-from-folder" "^1.0.1"
-    glob "^8.0.1"
-    minimatch "^5.0.1"
-    read-package-json-fast "^2.0.3"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+    read-package-json-fast "^2.0.1"
 
-"@npmcli/metavuln-calculator@^3.0.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622"
-  integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA==
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
   dependencies:
-    cacache "^16.0.0"
-    json-parse-even-better-errors "^2.3.1"
-    pacote "^13.0.3"
-    semver "^7.3.5"
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
 
-"@npmcli/move-file@^1.0.1":
+"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
@@ -1724,61 +1711,43 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/name-from-folder@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
   integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/node-gyp@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
-  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
+  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
-"@npmcli/package-json@*", "@npmcli/package-json@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
-  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+"@npmcli/package-json@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
+  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
   dependencies:
     json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/promise-spawn@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
-  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/query@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-1.1.1.tgz#462c4268473ae39e89d5fefbad94d9af7e1217c4"
-  integrity sha512-UF3I0fD94wzQ84vojMO2jDB8ibjRSTqhi8oz2mzVKiJ9gZHbeGlu9kzPvgHuGDK0Hf2cARhWtTfCDHNEwlL9hg==
-  dependencies:
-    npm-package-arg "^9.1.0"
-    postcss-selector-parser "^6.0.10"
-    semver "^7.3.7"
-
-"@npmcli/run-script@*", "@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946"
-  integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==
+"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6":
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
+  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
   dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^9.0.0"
-    read-package-json-fast "^2.0.3"
-    which "^2.0.2"
+    "@npmcli/node-gyp" "^1.0.2"
+    "@npmcli/promise-spawn" "^1.3.2"
+    node-gyp "^7.1.0"
+    read-package-json-fast "^2.0.1"
 
 "@psychedelic/browser-rpc@2.1.0":
   version "2.1.0"
-  resolved "https://npm.pkg.github.com/download/@psychedelic/browser-rpc/2.1.0/37bf3127c7965db67a23d175dcedb215071eb296cec588363957cd486d80a3b8#5b86ef4423ee996238150a69afabc65b469e7564"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/browser-rpc/2.1.0/5b86ef4423ee996238150a69afabc65b469e7564#5b86ef4423ee996238150a69afabc65b469e7564"
   integrity sha512-JBpVLJXRTlzclsx83SQk0AN/LHhUsdEbmPnkr1V49SFYvk/6Nj0d7l7BTCF+p2V1y8HluVYqT+ChMdn7KiW7Zw==
   dependencies:
     extensionizer "^1.0.1"
@@ -1787,7 +1756,7 @@
 
 "@psychedelic/cap-js@0.0.7":
   version "0.0.7"
-  resolved "https://npm.pkg.github.com/download/@psychedelic/cap-js/0.0.7/fdd88b53949ab9077b5aef84e137ffedcf367b451b1ba90f279c742c979921fb#8184d6ab5732f9a69380dfba5aed4d62e5e71051"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/cap-js/0.0.7/8184d6ab5732f9a69380dfba5aed4d62e5e71051#8184d6ab5732f9a69380dfba5aed4d62e5e71051"
   integrity sha512-SdvL0DhDPKAUyY8/BXf39WuLFRIzqWeuHwLEqXYH8kO1k2jHR7mbT3pwNNIScuOEbbL2myxHy141QTfkpoHZaA==
   dependencies:
     "@dfinity/agent" "^0.10.1"
@@ -1824,10 +1793,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.19.8":
-  version "0.19.8"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.8/0d6ca60ad6449c0d20aa193e5d29dac578d2b941#0d6ca60ad6449c0d20aa193e5d29dac578d2b941"
-  integrity sha512-9Qe+p9m6Ju/Me73XrVYjlDbooRffW4O6fPTl3PIhWvApU22i9bdj7hak/1cC7e9qh5fwah4nk7r5k/avRgS71w==
+"@psychedelic/plug-controller@0.19.10":
+  version "0.19.10"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.10/a68fd3461d0d88a27e62321c5ba0963203f60ac9#a68fd3461d0d88a27e62321c5ba0963203f60ac9"
+  integrity sha512-EUiChzWlSqTNQRDmiy+2YRdnEfgc2zEpWxBxm284wa0yZhAO1hp3jZE3NauO/HkfL/ahiZeQbJ6q07uvNYlxmA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1859,7 +1828,7 @@
 
 "@psychedelic/plug-inpage-provider@^2.3.0":
   version "2.3.0"
-  resolved "https://npm.pkg.github.com/download/@psychedelic/plug-inpage-provider/2.3.0/0c4424af91f59e1cee347c6bcb34a4fef7a3409bb0fa8b17f4c350088a74324d#5e5510ab742506cbc20f0e74688e13142ec15b73"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-inpage-provider/2.3.0/5e5510ab742506cbc20f0e74688e13142ec15b73#5e5510ab742506cbc20f0e74688e13142ec15b73"
   integrity sha512-JBIR9k7+Jxj2xQ4cHDUkz1WmIe4VVk3kmyt7RaaePAQDUwHUhz0gISV5jpTBNKWqziF70ANDM66BjCkTrFSQEA==
   dependencies:
     "@dfinity/agent" "0.9.3"
@@ -1872,9 +1841,9 @@
     json-bigint "^1.0.0"
 
 "@reduxjs/toolkit@^1.6.0":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.8.3.tgz#9c6a9c497bde43a67618d37a4175a00ae12efeb2"
-  integrity sha512-lU/LDIfORmjBbyDLaqFN2JB9YmAT1BElET9y0ZszwhSBa5Ef3t6o5CrHupw5J1iOXwd+o92QfQZ8OJpwXvsssg==
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.8.5.tgz#c14bece03ee08be88467f22dc0ecf9cf875527cd"
+  integrity sha512-f4D5EXO7A7Xq35T0zRbWq5kJQyXzzscnHKmjnu2+37B3rwHU6mX9PYlbfXdnxcY6P/7zfmjhgan0Z+yuOfeBmA==
   dependencies:
     immer "^9.0.7"
     redux "^4.1.2"
@@ -1899,9 +1868,9 @@
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
 "@sinclair/typebox@^0.24.1":
-  version "0.24.20"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.20.tgz#11a657875de6008622d53f56e063a6347c51a6dd"
-  integrity sha512-kVaO5aEFZb33nPMTZBxiPEkY+slxiPtqC7QX8f9B3eGOMBvEfuMfxp9DSTTCsRJPumPKjrge4yagyssO4q6qzQ==
+  version "0.24.34"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.34.tgz#35b799cf98a203d1940c8ce06688f9a09fbc0f50"
+  integrity sha512-x3ejWKw7rpy30Bvm6U0AQMOHdjqe2E3YJrBHlTxH0KFsp77bBa+MH324nJxtXZFpnTy/JW2h5HPYVm0vG2WPnw==
 
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
@@ -1929,11 +1898,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.1.19"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
@@ -1961,9 +1925,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.17.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.17.1.tgz#1a0e73e8c28c7e832656db372b779bfd2ef37314"
-  integrity sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==
+  version "7.18.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.1.tgz#ce5e2c8c272b99b7a9fd69fa39f0b4cd85028bd9"
+  integrity sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -2078,19 +2042,19 @@
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
 "@types/lodash@^4.14.172":
-  version "4.14.182"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2"
-  integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
+  version "4.14.184"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.184.tgz#23f96cd2a21a28e106dc24d825d4aa966de7a9fe"
+  integrity sha512-RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q==
 
 "@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/node@*":
-  version "18.0.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.6.tgz#0ba49ac517ad69abe7a1508bc9b3a5483df9d5d7"
-  integrity sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw==
+  version "18.7.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.14.tgz#0fe081752a3333392d00586d815485a17c2cf3c9"
+  integrity sha512-6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA==
 
 "@types/node@11.11.6":
   version "11.11.6"
@@ -2103,9 +2067,9 @@
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prettier@^2.1.5":
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.3.tgz#68ada76827b0010d0db071f739314fa429943d0a"
-  integrity sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc"
+  integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==
 
 "@types/prop-types@*":
   version "15.7.5"
@@ -2135,9 +2099,9 @@
     "@types/react" "*"
 
 "@types/react@*":
-  version "18.0.15"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.15.tgz#d355644c26832dc27f3e6cbf0c4f4603fc4ab7fe"
-  integrity sha512-iz3BtLuIYH1uWdsv6wXYdhozhqj20oD4/Hk2DNXIn1kFsmp9x8d9QB6FnPhfkbhd2PgEONt9Q1x/ebkwjfFLow==
+  version "18.0.18"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.18.tgz#9f16f33d57bc5d9dca848d12c3572110ff9429ac"
+  integrity sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
@@ -2156,9 +2120,9 @@
     "@types/node" "*"
 
 "@types/semver@^7.3.8":
-  version "7.3.10"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73"
-  integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw==
+  version "7.3.12"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
+  integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
 
 "@types/source-list-map@*":
   version "0.1.2"
@@ -2176,9 +2140,9 @@
   integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
 
 "@types/uglify-js@*":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.16.0.tgz#2cf74a0e6ebb6cd54c0d48e509d5bd91160a9602"
-  integrity sha512-0yeUr92L3r0GLRnBOvtYK1v2SjqMIqQDHMl7GLb+l2L8+6LSFWEEWEIgVsPdMn5ImLM8qzWT8xFPtQYpp8co0g==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.0.tgz#95271e7abe0bf7094c60284f76ee43232aef43b9"
+  integrity sha512-3HO6rm0y+/cqvOyA8xcYLweF0TKXlAxmQASjbOi49Co51A1N4nR4bEwBgRoD9kNM+rqFGArjKr654SLp2CoGmQ==
   dependencies:
     source-map "^0.6.1"
 
@@ -2237,9 +2201,9 @@
     "@types/yargs-parser" "*"
 
 "@types/yargs@^17.0.8":
-  version "17.0.10"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a"
-  integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==
+  version "17.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526"
+  integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -2437,7 +2401,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@*, abbrev@1, abbrev@^1.0.0:
+abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2471,9 +2435,9 @@ acorn@^7.1.1, acorn@^7.4.0:
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.2.4, acorn@^8.5.0:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
 adjust-sourcemap-loader@3.0.0:
   version "3.0.0"
@@ -2495,7 +2459,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -2522,7 +2486,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2559,7 +2523,7 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
+ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2593,12 +2557,12 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.0.tgz#87313c102b8118abd57371afab34618bf7350ed3"
   integrity sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==
 
-ansicolors@*:
+ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
 
-ansistyles@*:
+ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
   integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
@@ -2619,16 +2583,16 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 archiver-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
@@ -2658,19 +2622,27 @@ archiver@^5.3.0:
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
-archy@*:
+archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2790,6 +2762,18 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, 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==
+
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2834,18 +2818,28 @@ atob@^2.1.2:
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@^10.0.2:
-  version "10.4.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.7.tgz#1db8d195f41a52ca5069b7593be167618edbbedf"
-  integrity sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==
+  version "10.4.8"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5"
+  integrity sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==
   dependencies:
-    browserslist "^4.20.3"
-    caniuse-lite "^1.0.30001335"
+    browserslist "^4.21.3"
+    caniuse-lite "^1.0.30001373"
     fraction.js "^4.2.0"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-axe-core@^4.4.2:
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
+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==
@@ -3099,29 +3093,29 @@ babel-plugin-jest-hoist@^28.1.3:
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-polyfill-corejs2@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
-  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+babel-plugin-polyfill-corejs2@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
+  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.2"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
-  integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
+babel-plugin-polyfill-corejs3@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
+  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/helper-define-polyfill-provider" "^0.3.2"
     core-js-compat "^3.21.0"
 
-babel-plugin-polyfill-regenerator@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
-  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
+babel-plugin-polyfill-regenerator@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
+  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/helper-define-polyfill-provider" "^0.3.2"
 
 babel-plugin-react-require@^3.1.3:
   version "3.1.3"
@@ -3660,34 +3654,41 @@ bash-path@^1.0.1:
     arr-union "^3.1.0"
     is-windows "^1.0.1"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 bigint-conversion@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/bigint-conversion/-/bigint-conversion-2.2.1.tgz#08c9f17a826943c7e56d4bfa9f0fc7fe8050a940"
-  integrity sha512-9TvqpV+VZ04fPKv4KPLQRk5ZAFhgHX4F7bYQY263/BbJBFzEGbtBeTQV9oNuAGaqj88PXdov1OcSNQtq9K9MPA==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/bigint-conversion/-/bigint-conversion-2.2.2.tgz#603bd06c54addacfed9c7e1ef64dff2fc0fe7ea6"
+  integrity sha512-qn8Knx8QOXL7mbiqWMD/o8i9ijp/ERJYcQBHQX8cxgdMSptE/gY+t16di5DVjg9M3bh85j7kIHO9zwmixQ0sYw==
   dependencies:
     "@juanelas/base64" "^1.0.1"
 
 bignumber.js@^9.0.0:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.2.tgz#71c6c6bed38de64e24a65ebe16cfcf23ae693673"
-  integrity sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62"
+  integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==
 
-bin-links@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.2.tgz#5c40f14b0742faa2ae952caa76b4a29090befcbb"
-  integrity sha512-+oSWBdbCUK6X4LOCSrU36fWRzZNaK7/evX7GozR9xwl2dyiVi3UOUwTyyOVYI1FstgugfsM9QESRrWo7gjCYbg==
+bin-links@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967"
+  integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA==
   dependencies:
-    cmd-shim "^5.0.0"
+    cmd-shim "^4.0.1"
     mkdirp-infer-owner "^2.0.0"
     npm-normalize-package-bin "^1.0.0"
-    read-cmd-shim "^3.0.0"
+    read-cmd-shim "^2.0.0"
     rimraf "^3.0.0"
-    write-file-atomic "^4.0.0"
+    write-file-atomic "^3.0.3"
 
 binary-extensions@^1.0.0:
   version "1.13.1"
@@ -3706,16 +3707,6 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bip39@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.2.tgz#2baf42ff3071fc9ddd5103de92e8f80d9257ee32"
-  integrity sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==
-  dependencies:
-    "@types/node" "11.11.6"
-    create-hash "^1.1.0"
-    pbkdf2 "^3.0.9"
-    randombytes "^2.0.1"
-
 bip39@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.4.tgz#5b11fed966840b5e1b8539f0f54ab6392969b2a0"
@@ -3885,15 +3876,15 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.0.0, browserslist@^4.20.2, browserslist@^4.20.3, browserslist@^4.21.2:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.2.tgz#59a400757465535954946a400b841ed37e2b4ecf"
-  integrity sha512-MonuOgAtUB46uP5CezYbRaYKBNt2LxP0yX+Pmj4LkcDFGkn9Cbpi83d9sCjwQDErXsIJSzY5oKGDbgOlF/LPAA==
+browserslist@^4.0.0, browserslist@^4.20.2, browserslist@^4.21.3:
+  version "4.21.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
+  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
   dependencies:
-    caniuse-lite "^1.0.30001366"
-    electron-to-chromium "^1.4.188"
+    caniuse-lite "^1.0.30001370"
+    electron-to-chromium "^1.4.202"
     node-releases "^2.0.6"
-    update-browserslist-db "^1.0.4"
+    update-browserslist-db "^1.0.5"
 
 bs58@^4.0.0:
   version "4.0.1"
@@ -3970,36 +3961,10 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
-
-cacache@*:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -4022,7 +3987,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.5:
+cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -4046,30 +4011,6 @@ cacache@^15.0.5:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
-  version "16.1.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.2.tgz#a519519e9fc9e5e904575dcd3b77660cbf03f749"
-  integrity sha512-Xx+xPlfCZIUHagysjjOAje9nRo8pRDczQCcXb4J2O0BLtH+xeVue6ba4y1kfJfQMAnM2mkcoMIAyOctlaRGWYA==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^1.1.1"
-
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -4150,10 +4091,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001335, caniuse-lite@^1.0.30001366:
-  version "1.0.30001367"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001367.tgz#2b97fe472e8fa29c78c5970615d7cd2ee414108a"
-  integrity sha512-XDgbeOHfifWV3GEES2B8rtsrADx4Jf+juKX2SICJcaUhjYBO3bR96kvEIHa15VU6ohtOhBZuPGGYGbXMRn0NCw==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373:
+  version "1.0.30001388"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz#88e01f4591cbd81f9f665f3f078c66b509fbe55d"
+  integrity sha512-znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -4162,10 +4103,10 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-chalk@*:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
-  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 chalk@^1.1.3:
   version "1.1.3"
@@ -4242,16 +4183,16 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@*, chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
 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==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -4317,13 +4258,13 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-columns@*:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
-  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
+cli-columns@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
+  integrity sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==
   dependencies:
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.1"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -4332,7 +4273,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@*:
+cli-table3@^0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a"
   integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==
@@ -4405,10 +4346,10 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
-cmd-shim@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
-  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
@@ -4426,6 +4367,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4471,7 +4417,7 @@ color-string@1.5.5, color-string@^0.3.0, color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -4503,15 +4449,15 @@ colors@1.4.0, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@*:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==
   dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4605,7 +4551,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -4669,23 +4615,28 @@ copy-webpack-plugin@^6.3.1:
     webpack-sources "^1.4.3"
 
 core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.23.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.23.5.tgz#11edce2f1c4f69a96d30ce77c805ce118909cd5b"
-  integrity sha512-fHYozIFIxd+91IIbXJgWd/igXIc8Mf9is0fusswjnGIWVG96y2cwyUdlCkGOw6rMLHKAxg7xtCIVaHsyOUnJIg==
+  version "3.25.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.0.tgz#489affbfbf9cb3fa56192fe2dd9ebaee985a66c5"
+  integrity sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==
   dependencies:
-    browserslist "^4.21.2"
+    browserslist "^4.21.3"
     semver "7.0.0"
 
 core-js-pure@^3.20.2:
-  version "3.23.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.23.5.tgz#23daaa9af9230e50f10b0fa4b8e6b87402be4c33"
-  integrity sha512-8t78LdpKSuCq4pJYCYk8hl7XEkAX+BP16yRIwL3AanTksxuEf7CM83vRyctmiEL8NDZ3jpUcv56fk9/zG3aIuw==
+  version "3.25.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.0.tgz#f8d1f176ff29abbfeb610110de891d5ae5a361d4"
+  integrity sha512-IeHpLwk3uoci37yoI2Laty59+YqH9x5uR65/yiA0ARAJrTrN4YU0rmauLWfvqOuk77SlNJXj2rM6oT/dBD87+A==
 
 core-js@^2.4.0:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+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==
+
 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"
@@ -5078,6 +5029,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5119,9 +5077,9 @@ decamelize@^1.2.0:
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decimal.js@^10.2.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.0.tgz#97a7448873b01e92e5ff9117d89a7bca8e63e0fe"
+  integrity sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
@@ -5399,9 +5357,9 @@ dot-prop@^5.2.0:
     is-obj "^2.0.0"
 
 dotenv@^16.0.1:
-  version "16.0.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
-  integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
+  version "16.0.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.2.tgz#0b0f8652c016a3858ef795024508cddc4bffc5bf"
+  integrity sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.7.1"
@@ -5423,19 +5381,26 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 ed25519-hd-key@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ed25519-hd-key/-/ed25519-hd-key-1.2.0.tgz#819d43c6a96477c9385bd121dccc94dbc6c6598c"
-  integrity sha512-pwES3tQ4Z8g3sfIBZEgtuTwFtHq5AlB9L8k9a48k7qPn74q2OmgrrgkdwyJ+P2GVTOBVCClAC7w21Wpksso3gw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ed25519-hd-key/-/ed25519-hd-key-1.3.0.tgz#e0bd2be4c07e15c753d5ed3aca30744e321b7c78"
+  integrity sha512-IWwAyiiuJQhgu3L8NaHb68eJxTu2pgCwxIBdgpLJdKpYZM46+AXePSVTr7fkNKaUOfOL4IrjEUaQvyVRIDP7fg==
   dependencies:
-    bip39 "3.0.2"
     create-hmac "1.1.7"
     tweetnacl "1.0.3"
 
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.188:
-  version "1.4.195"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.195.tgz#139b2d95a42a3f17df217589723a1deac71d1473"
-  integrity sha512-vefjEh0sk871xNmR5whJf9TEngX+KTKS3hOHpjoMpauKkwlGwtMz1H8IaIjAT/GNnX0TbGwAdmVoXCAzXf+PPg==
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.202:
+  version "1.4.241"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.241.tgz#5aa03ab94db590d8269f4518157c24b1efad34d6"
+  integrity sha512-e7Wsh4ilaioBZ5bMm6+F4V5c11dh56/5Jwz7Hl5Tu1J7cnB+Pqx5qIF2iC7HPpfyQMqGSvvLP5bBAIDd2gAtGw==
 
 elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
@@ -5461,9 +5426,9 @@ emoji-log@^1.0.2:
   integrity sha512-3r9WI8xWU3gaeuPSrHEO9cbTybzlud82v98qeJlwyeGhUhKMleKdvDLegn/CPd1UZiFfTgl5VmJ9OW7I0y7CVA==
 
 emoji-picker-react@^3.4.7:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/emoji-picker-react/-/emoji-picker-react-3.5.1.tgz#dbb4cda675a58dc86624d2fc488f75c2f4fc377d"
-  integrity sha512-cuSthFAvUO8Q1N7KJPEgZ7N0JNIWPKgN5GUmKe71UlSD4qFYI/p05RT9nohlWOq6YSFhEy2mI/60zBZiaku4mg==
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/emoji-picker-react/-/emoji-picker-react-3.6.1.tgz#dc066f4d6bd407bfd7aebb18d8a0ef8171584b07"
+  integrity sha512-bJNvpdf3wO+1z4V/GKZC159zSAgUjLP8gdgGzvi/sFjy11Zpi/O9a8/G2rpQwy+QBePnmvS1F+MqcNVJvilEGA==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -5490,7 +5455,7 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-encoding@^0.1.13:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -5560,15 +5525,15 @@ error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
-  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.2.tgz#8495a07bc56d342a3b8ea3ab01bd986700c2ccb3"
+  integrity sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.1"
+    get-intrinsic "^1.1.2"
     get-symbol-description "^1.0.0"
     has "^1.0.3"
     has-property-descriptors "^1.0.0"
@@ -5580,9 +5545,9 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.0"
+    object-inspect "^1.12.2"
     object-keys "^1.1.1"
-    object.assign "^4.1.2"
+    object.assign "^4.1.4"
     regexp.prototype.flags "^1.4.3"
     string.prototype.trimend "^1.0.5"
     string.prototype.trimstart "^1.0.5"
@@ -5610,9 +5575,9 @@ es-to-primitive@^1.2.1:
     is-symbol "^1.0.2"
 
 es5-ext@^0.10.35, es5-ext@^0.10.50:
-  version "0.10.61"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.61.tgz#311de37949ef86b6b0dcea894d1ffedb909d3269"
-  integrity sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==
+  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"
@@ -5699,12 +5664,11 @@ eslint-import-resolver-node@^0.3.6:
     resolve "^1.20.0"
 
 eslint-module-utils@^2.7.3:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
-  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
   dependencies:
     debug "^3.2.7"
-    find-up "^2.1.0"
 
 eslint-plugin-import@^2.22.1:
   version "2.26.0"
@@ -5726,28 +5690,28 @@ eslint-plugin-import@^2.22.1:
     tsconfig-paths "^3.14.1"
 
 eslint-plugin-jsx-a11y@^6.4.1:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.0.tgz#2c5ac12e013eb98337b9aa261c3b355275cc6415"
-  integrity sha512-kTeLuIzpNhXL2CwLlc8AHI0aFRwWHcg483yepO9VQiHzM9bZwJdzTkzBszbuPrbgGmq2rlX/FaT2fJQsjUSHsw==
+  version "6.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff"
+  integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==
   dependencies:
-    "@babel/runtime" "^7.18.3"
+    "@babel/runtime" "^7.18.9"
     aria-query "^4.2.2"
     array-includes "^3.1.5"
     ast-types-flow "^0.0.7"
-    axe-core "^4.4.2"
+    axe-core "^4.4.3"
     axobject-query "^2.2.0"
     damerau-levenshtein "^1.0.8"
     emoji-regex "^9.2.2"
     has "^1.0.3"
-    jsx-ast-utils "^3.3.1"
+    jsx-ast-utils "^3.3.2"
     language-tags "^1.0.5"
     minimatch "^3.1.2"
     semver "^6.3.0"
 
 eslint-plugin-react@^7.22.0:
-  version "7.30.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz#2be4ab23ce09b5949c6631413ba64b2810fd3e22"
-  integrity sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==
+  version "7.31.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.5.tgz#87c17c82f805257f4f7c96dd484534db2b5089c4"
+  integrity sha512-y7472VAcqns17rsQUk6tQCnqBi+boYjGdYarX022719+wGd1T4U1fOYJ2T2Trd3Od2q5M92e42zJ2uZOGmWamA==
   dependencies:
     array-includes "^3.1.5"
     array.prototype.flatmap "^1.3.0"
@@ -5989,11 +5953,11 @@ expect@^28.1.3:
     jest-util "^28.1.3"
 
 ext@^1.1.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
-  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
   dependencies:
-    type "^2.5.0"
+    type "^2.7.2"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -6010,6 +5974,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extensionizer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/extensionizer/-/extensionizer-1.0.1.tgz#504544239a7610ba8404b15c1832091a37768d09"
@@ -6040,6 +6009,16 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+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==
+
 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"
@@ -6078,16 +6057,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fastest-levenshtein@*:
+fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
-fastest-levenshtein@^1.0.12:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz#9054384e4b7a78c88d01a4432dc18871af0ac859"
-  integrity sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==
-
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -6235,13 +6209,6 @@ find-process@^1.4.7:
     commander "^5.1.0"
     debug "^4.1.1"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==
-  dependencies:
-    locate-path "^2.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"
@@ -6274,9 +6241,9 @@ flat-cache@^3.0.4:
     rimraf "^3.0.2"
 
 flatted@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
-  integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 flush-write-stream@^1.0.0:
   version "1.1.1"
@@ -6316,6 +6283,11 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -6325,6 +6297,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 fraction.js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
@@ -6429,19 +6410,34 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    wide-align "^1.1.2"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6453,7 +6449,7 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
   integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
@@ -6499,6 +6495,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-parent@5.1.2, glob-parent@^3.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -6511,18 +6514,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@*, glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6558,9 +6550,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.6.0, globals@^13.9.0:
-  version "13.16.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.16.0.tgz#9be4aca28f311aaeb974ea54978ebbb5e35ce46a"
-  integrity sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==
+  version "13.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
+  integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
   dependencies:
     type-fest "^0.20.2"
 
@@ -6606,11 +6598,24 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.8, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -6664,7 +6669,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
@@ -6766,12 +6771,12 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@*, hosted-git-info@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
-  integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
+hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
-    lru-cache "^7.5.1"
+    lru-cache "^6.0.0"
 
 hsl-regex@^1.0.0:
   version "1.0.0"
@@ -6854,14 +6859,14 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -6946,12 +6951,12 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore-walk@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
-  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+ignore-walk@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
-    minimatch "^5.0.1"
+    minimatch "^3.0.4"
 
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
@@ -7035,33 +7040,28 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-ini@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
-
 ini@^1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ini@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1"
-  integrity sha512-TxYQaeNW/N8ymDvwAxPyRbhMBtnEwuvaTYpOQkFx1nSeusgezHniEc/l35Vo4iCq/mMiTJbpD7oYxN98hFlfmw==
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-init-package-json@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
-  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
+init-package-json@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
   dependencies:
-    npm-package-arg "^9.0.1"
+    npm-package-arg "^8.1.5"
     promzard "^0.3.0"
-    read "^1.0.7"
-    read-package-json "^5.0.0"
+    read "~1.0.1"
+    read-package-json "^4.1.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^4.0.0"
+    validate-npm-package-name "^3.0.0"
 
 internal-slot@^1.0.3:
   version "1.0.3"
@@ -7169,7 +7169,7 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@*:
+is-cidr@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
   integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
@@ -7188,10 +7188,10 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.8.1, is-core-module@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
+is-core-module@^2.5.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"
+  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
   dependencies:
     has "^1.0.3"
 
@@ -7256,6 +7256,18 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
 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"
@@ -7409,7 +7421,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -7463,6 +7475,11 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -8061,6 +8078,11 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsconfig-paths-jest-mapper@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsconfig-paths-jest-mapper/-/jsconfig-paths-jest-mapper-1.0.0.tgz#cd8570e9f6eabb33890b27eb51bc7b6e91a8564e"
@@ -8123,7 +8145,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   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==
@@ -8138,6 +8160,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8148,6 +8175,11 @@ json-stringify-nice@^1.1.4:
   resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
   integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
 
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json-text-sequence@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2"
@@ -8181,98 +8213,108 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
 jss-plugin-camel-case@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
-  integrity sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.2.tgz#76dddfa32f9e62d17daa4e3504991fd0933b89e1"
+  integrity sha512-wgBPlL3WS0WDJ1lPJcgjux/SHnDuu7opmgQKSraKs4z8dCCyYMx9IDPFKBXQ8Q5dVYij1FFV0WdxyhuOOAXuTg==
   dependencies:
     "@babel/runtime" "^7.3.1"
     hyphenate-style-name "^1.0.3"
-    jss "10.9.0"
+    jss "10.9.2"
 
 jss-plugin-default-unit@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz#bb23a48f075bc0ce852b4b4d3f7582bc002df991"
-  integrity sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.2.tgz#3e7f4a1506b18d8fe231554fd982439feb2a9c53"
+  integrity sha512-pYg0QX3bBEFtTnmeSI3l7ad1vtHU42YEEpgW7pmIh+9pkWNWb5dwS/4onSfAaI0kq+dOZHzz4dWe+8vWnanoSg==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.9.2"
 
 jss-plugin-global@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz#fc07a0086ac97aca174e37edb480b69277f3931f"
-  integrity sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.2.tgz#e7f2ad4a5e8e674fb703b04b57a570b8c3e5c2c2"
+  integrity sha512-GcX0aE8Ef6AtlasVrafg1DItlL/tWHoC4cGir4r3gegbWwF5ZOBYhx04gurPvWHC8F873aEGqge7C17xpwmp2g==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.9.2"
 
 jss-plugin-nested@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz#cc1c7d63ad542c3ccc6e2c66c8328c6b6b00f4b3"
-  integrity sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.2.tgz#3aa2502816089ecf3981e1a07c49b276d67dca63"
+  integrity sha512-VgiOWIC6bvgDaAL97XCxGD0BxOKM0K0zeB/ECyNaVF6FqvdGB9KBBWRdy2STYAss4VVA7i5TbxFZN+WSX1kfQA==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.9.2"
     tiny-warning "^1.0.2"
 
 jss-plugin-props-sort@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz#30e9567ef9479043feb6e5e59db09b4de687c47d"
-  integrity sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.2.tgz#645f6c8f179309667b3e6212f66b59a32fb3f01f"
+  integrity sha512-AP1AyUTbi2szylgr+O0OB7gkIxEGzySLITZ2GpsaoX72YMCGI2jYAc+WUhPfvUnZYiauF4zTnN4V4TGuvFjJlw==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.9.2"
 
 jss-plugin-rule-value-function@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz#379fd2732c0746fe45168011fe25544c1a295d67"
-  integrity sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.2.tgz#9afe07596e477123cbf11120776be6a64494541f"
+  integrity sha512-vf5ms8zvLFMub6swbNxvzsurHfUZ5Shy5aJB2gIpY6WNA3uLinEcxYyraQXItRHi5ivXGqYciFDRM2ZoVoRZ4Q==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.9.2"
     tiny-warning "^1.0.2"
 
 jss-plugin-vendor-prefixer@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz#aa9df98abfb3f75f7ed59a3ec50a5452461a206a"
-  integrity sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.2.tgz#410a0f3b9f8dbbfba58f4d329134df4849aa1237"
+  integrity sha512-SxcEoH+Rttf9fEv6KkiPzLdXRmI6waOTcMkbbEFgdZLDYNIP9UKNHFy6thhbRKqv0XMQZdrEsbDyV464zE/dUA==
   dependencies:
     "@babel/runtime" "^7.3.1"
     css-vendor "^2.0.8"
-    jss "10.9.0"
+    jss "10.9.2"
 
-jss@10.9.0, jss@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.0.tgz#7583ee2cdc904a83c872ba695d1baab4b59c141b"
-  integrity sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==
+jss@10.9.2, jss@^10.5.1:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.2.tgz#9379be1f195ef98011dfd31f9448251bd61b95a9"
+  integrity sha512-b8G6rWpYLR4teTUbGd4I4EsnWjg7MN0Q5bSsjKhVkJVjhQDy2KzkbD2AW3TuT0RYZVmZZHKIrXDn6kjU14qkUg==
   dependencies:
     "@babel/runtime" "^7.3.1"
     csstype "^3.0.2"
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
-"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.2.tgz#afe5efe4332cd3515c065072bd4d6b0aa22152bd"
-  integrity sha512-4ZCADZHRkno244xlNnn4AOG6sRQ7iBZ5BbgZ4vW4y5IZw7cVUD1PPeblm1xx/nfmMxPdt/LHsXZW8z/j58+l9Q==
+"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==
   dependencies:
     array-includes "^3.1.5"
-    object.assign "^4.1.2"
+    object.assign "^4.1.3"
 
 junk@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
-just-diff-apply@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b"
-  integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g==
+just-diff-apply@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
+  integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
 
-just-diff@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202"
-  integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ==
+just-diff@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
+  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
 
 keycode@^2.1.7:
   version "2.2.1"
@@ -8378,118 +8420,115 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@*:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded"
-  integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg==
+libnpmaccess@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
 
-libnpmdiff@*:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.4.tgz#487ccb609dacd7f558f089feef3153933e157d02"
-  integrity sha512-bUz12309DdkeFL/K0sKhW1mbg8DARMbNI0vQKrJp1J8lxhxqkAjzSQ3eQCacFjSwCz4xaf630ogwuOkSt61ZEQ==
+libnpmdiff@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
+  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
   dependencies:
-    "@npmcli/disparity-colors" "^2.0.0"
+    "@npmcli/disparity-colors" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
     binary-extensions "^2.2.0"
     diff "^5.0.0"
-    minimatch "^5.0.1"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    minimatch "^3.0.4"
+    npm-package-arg "^8.1.1"
+    pacote "^11.3.0"
     tar "^6.1.0"
 
-libnpmexec@*:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.11.tgz#3307fd7b683630268237936a921f5faadd5bfaef"
-  integrity sha512-uhkAWVT0pA1kVgqgTjIMVebOPl3PpIvVcRQ1IBV47ppVxmQr+JCjDahrV0K/0JUsKSVFozyGEEmg1Kz0HwRwzw==
+libnpmexec@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
+  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
   dependencies:
-    "@npmcli/arborist" "^5.0.0"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/fs" "^2.1.1"
-    "@npmcli/run-script" "^4.2.0"
+    "@npmcli/arborist" "^2.3.0"
+    "@npmcli/ci-detect" "^1.3.0"
+    "@npmcli/run-script" "^1.8.4"
     chalk "^4.1.0"
     mkdirp-infer-owner "^2.0.0"
-    npm-package-arg "^9.0.1"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    proc-log "^2.0.0"
+    npm-package-arg "^8.1.2"
+    pacote "^11.3.1"
+    proc-log "^1.0.0"
     read "^1.0.7"
     read-package-json-fast "^2.0.2"
-    semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.2.tgz#7da0827950f0db2cce0acb0dc7652d1834a8b239"
-  integrity sha512-wmFMP/93Wjy+jDg5LaSldDgAhSgCyA64JUUmp806Kae7y3YP9Qv5m1vUhPxT4yebxgB2v/I6G1/RUcNb1y0kVg==
+libnpmfund@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
+  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
   dependencies:
-    "@npmcli/arborist" "^5.0.0"
+    "@npmcli/arborist" "^2.5.0"
 
-libnpmhook@*:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.3.tgz#9628518a63455d21dafda312ee46175275707ff5"
-  integrity sha512-TEdNI1mC5zS+w/juCgxrwwQnpbq9lY76NDOS0N37pn6pWIUxB1Yq8mwy6MUEXR1TgH4HurSQyKT6I6Kp9Wjm4A==
+libnpmhook@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30"
+  integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmorg@*:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.3.tgz#a85cbdb3665ad4f7c7279d239a4581ec2eeef5a6"
-  integrity sha512-r4CpmCEF+e5PbFMBi64xSXmqn0uGgV4T7NWpGL4/A6KT/DTtIxALILQZq+l0ZdN1xm4RjOvqSDR22oT4il8rAQ==
+libnpmorg@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc"
+  integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmpack@*:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.1.2.tgz#9234a3b1ae433f922c19e97cd3a8a0b135b5f4cc"
-  integrity sha512-megSAPeZGv9jnDM4KovKbczjyuy/EcPxCIU/iaWsDU1IEAVtBJ0qHqNUm5yN2AgN501Tb3CL6KeFGYdG4E31rQ==
+libnpmpack@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
+  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
   dependencies:
-    "@npmcli/run-script" "^4.1.3"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    "@npmcli/run-script" "^1.8.3"
+    npm-package-arg "^8.1.0"
+    pacote "^11.2.6"
 
-libnpmpublish@*:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.4.tgz#adb41ec6b0c307d6f603746a4d929dcefb8f1a0b"
-  integrity sha512-lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg==
+libnpmpublish@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
   dependencies:
-    normalize-package-data "^4.0.0"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
-    semver "^7.3.7"
-    ssri "^9.0.0"
+    normalize-package-data "^3.0.2"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
+    semver "^7.1.3"
+    ssri "^8.0.1"
 
-libnpmsearch@*:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.3.tgz#ed502a4c2c70ea36723180455fae1357546b2184"
-  integrity sha512-Ofq76qKAPhxbiyzPf/5LPjJln26VTKwU9hIU0ACxQ6tNtBJ1CHmI7iITrdp7vNezhZc0FlkXwrIpqXjhBJZgLQ==
+libnpmsearch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3"
+  integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==
   dependencies:
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmteam@*:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.3.tgz#9335fbbd032b3770f5c9b7ffc6203f47d1ed144a"
-  integrity sha512-LsYYLz4TlTpcqkusInY5MhKjiHFaCx1GV0LmydXJ/QMh+3IWBJpUhes4ynTZuFoJKkDIFjxyMU09ul+RZixgdg==
+libnpmteam@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c"
+  integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmversion@*:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.6.tgz#a4a476d38a44d38db9ac424a5e7334479e7fb8b9"
-  integrity sha512-+lI+AO7cZwDxyAeWCIR8+n9XEfgSDAqmNbv4zy+H6onGthsk/+E3aa+5zIeBpyG5g268zjpc0qrBch0Q3w0nBA==
+libnpmversion@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9"
+  integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/run-script" "^4.1.3"
+    "@npmcli/git" "^2.0.7"
+    "@npmcli/run-script" "^1.8.4"
     json-parse-even-better-errors "^2.3.1"
-    proc-log "^2.0.0"
-    semver "^7.3.7"
+    semver "^7.3.5"
+    stringify-package "^1.0.1"
 
 lilconfig@2.0.5:
   version "2.0.5"
@@ -8566,14 +8605,6 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -8707,11 +8738,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
-  integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
-
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -8727,27 +8753,27 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@*, make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
+make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
     http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
+    http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
     minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
+    minipass-fetch "^1.3.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
+    negotiator "^0.6.2"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
 
 makeerror@1.0.12:
   version "1.0.12"
@@ -8862,7 +8888,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8905,7 +8931,7 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
@@ -8924,16 +8950,16 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
-  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
   dependencies:
-    minipass "^3.1.6"
+    minipass "^3.1.0"
     minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
+    minizlib "^2.0.0"
   optionalDependencies:
-    encoding "^0.1.13"
+    encoding "^0.1.12"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
@@ -8950,7 +8976,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -8964,14 +8990,14 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@*, minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
   integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -9016,7 +9042,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
+mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -9025,11 +9051,6 @@ mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -9037,6 +9058,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 moment@^2.29.1:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -9054,11 +9080,6 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@*, ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9069,6 +9090,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -9106,7 +9132,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.3:
+negotiator@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9163,20 +9189,20 @@ node-gyp-build@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
   integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
 
-node-gyp@*, node-gyp@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
-  integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
+node-gyp@^7.1.0, node-gyp@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
+    graceful-fs "^4.2.3"
     nopt "^5.0.0"
-    npmlog "^6.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
     rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -9218,13 +9244,6 @@ node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-nopt@*, nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -9232,15 +9251,15 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
-  integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
-    hosted-git-info "^5.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -9264,24 +9283,24 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-audit-report@*:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
-  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
+npm-audit-report@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
   dependencies:
     chalk "^4.0.0"
 
-npm-bundled@^1.1.1, npm-bundled@^1.1.2:
+npm-bundled@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
-  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
@@ -9290,61 +9309,53 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-normalize-package-bin@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff"
-  integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==
-
-npm-package-arg@*, npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
-  integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
   dependencies:
-    hosted-git-info "^5.0.0"
-    proc-log "^2.0.1"
-    semver "^7.3.5"
-    validate-npm-package-name "^4.0.0"
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
 
-npm-packlist@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
-  integrity sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==
+npm-packlist@^2.1.4:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
-    glob "^8.0.1"
-    ignore-walk "^5.0.1"
-    npm-bundled "^1.1.2"
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@*, npm-pick-manifest@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
-  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
   dependencies:
-    npm-install-checks "^5.0.0"
+    npm-install-checks "^4.0.0"
     npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^9.0.0"
-    semver "^7.3.5"
+    npm-package-arg "^8.1.2"
+    semver "^7.3.4"
 
-npm-profile@*:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.2.1.tgz#975c31ec75a6ae029ab5b8820ffdcbae3a1e3d5e"
-  integrity sha512-Tlu13duByHyDd4Xy0PgroxzxnBYWbGGL5aZifNp8cx2DxUrHSoETXtPKg38aRPsBWMRfDtvcvVfJNasj7oImQQ==
+npm-profile@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
+  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
   dependencies:
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    npm-registry-fetch "^11.0.0"
 
-npm-registry-fetch@*, npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
-  integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
+npm-registry-fetch@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
   dependencies:
-    make-fetch-happen "^10.0.6"
-    minipass "^3.1.6"
-    minipass-fetch "^2.0.3"
+    make-fetch-happen "^9.0.1"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^9.0.1"
-    proc-log "^2.0.0"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -9367,7 +9378,7 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@*:
+npm-user-validate@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
@@ -9446,14 +9457,24 @@ npm@7.22.0:
     which "^2.0.2"
     write-file-atomic "^3.0.3"
 
-npmlog@*, npmlog@^6.0.0, npmlog@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
   dependencies:
-    are-we-there-yet "^3.0.0"
+    are-we-there-yet "^2.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.3"
+    gauge "^3.0.0"
     set-blocking "^2.0.0"
 
 nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
@@ -9463,10 +9484,20 @@ nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+
 nwsapi@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
-  integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
+  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
+
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
@@ -9482,7 +9513,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-inspect@^1.12.0, object-inspect@^1.12.2, object-inspect@^1.9.0:
+object-inspect@^1.12.2, object-inspect@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
@@ -9499,14 +9530,14 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+object.assign@^4.1.0, object.assign@^4.1.2, object.assign@^4.1.3, object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
 object.entries@^1.1.2, object.entries@^1.1.5:
@@ -9582,7 +9613,7 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-opener@*:
+opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -9660,13 +9691,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -9681,13 +9705,6 @@ p-limit@^3.0.2, p-limit@^3.1.0:
   dependencies:
     yocto-queue "^0.1.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==
-  dependencies:
-    p-limit "^1.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"
@@ -9735,42 +9752,35 @@ p-timeout@^3.1.0:
   dependencies:
     p-finally "^1.0.0"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@*, pacote@^13.0.3, pacote@^13.6.1:
-  version "13.6.2"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
-  integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==
+pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5:
+  version "11.3.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
+  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/promise-spawn" "^3.0.0"
-    "@npmcli/run-script" "^4.1.0"
-    cacache "^16.0.0"
+    "@npmcli/git" "^2.1.0"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.8.2"
+    cacache "^15.0.5"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.6"
-    mkdirp "^1.0.4"
-    npm-package-arg "^9.0.0"
-    npm-packlist "^5.1.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^2.1.4"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^11.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^5.0.0"
-    read-package-json-fast "^2.0.3"
+    read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
+    ssri "^8.0.1"
+    tar "^6.1.0"
 
 pako@~1.0.5:
   version "1.0.11"
@@ -9812,14 +9822,14 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-conflict-json@*, parse-conflict-json@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
-  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+parse-conflict-json@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
+  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
   dependencies:
-    json-parse-even-better-errors "^2.3.1"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
+    json-parse-even-better-errors "^2.3.0"
+    just-diff "^3.0.1"
+    just-diff-apply "^3.0.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -9943,6 +9953,11 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -10307,7 +10322,7 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10361,9 +10376,9 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27:
     source-map "^0.6.1"
 
 postcss@^8.1.7, postcss@^8.2.15:
-  version "8.4.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
-  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
+  version "8.4.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
+  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"
@@ -10416,10 +10431,10 @@ private@^0.1.6:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-proc-log@^2.0.0, proc-log@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
-  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+proc-log@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
+  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -10510,7 +10525,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
-psl@^1.1.33:
+psl@^1.1.28, psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -10595,7 +10610,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qrcode-terminal@*:
+qrcode-terminal@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -10610,6 +10625,11 @@ qrcode@^1.4.4:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
 query-string@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
@@ -10630,6 +10650,11 @@ querystring@0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
 
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -10698,9 +10723,9 @@ react-feather@^2.0.9:
     prop-types "^15.7.2"
 
 react-i18next@^11.8.13:
-  version "11.18.1"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.1.tgz#ba86ed09069e129b8623a28f2b9a03d7f105ea6f"
-  integrity sha512-S8cl4mvIOSA7OQCE5jNy2yhv705Vwi+7PinpqKIYcBmX/trJtHKqrf6CL67WJSA8crr2JU+oxE9jn9DQIrQezg==
+  version "11.18.5"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.5.tgz#985e87bc66ed1316381b464a4ecfd35a2c951357"
+  integrity sha512-cKcyuuzIv0YUZ4l9WORflVNuhISPAqQShOAsxwFyYuJoCA7HlLmHm7XnvO6hfAGmGpDNRhJHoBX8hG49Cb2xZQ==
   dependencies:
     "@babel/runtime" "^7.14.5"
     html-parse-stringify "^3.0.1"
@@ -10741,9 +10766,9 @@ react-loading-skeleton@^3.1.0:
   integrity sha512-j1U1CWWs68nBPOg7tkQqnlFcAMFF6oEK6MgqAo15f8A5p7mjH6xyKn2gHbkcimpwfO0VQXqxAswnSYVr8lWzjw==
 
 react-number-format@^4.5.5:
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-4.9.3.tgz#338500fe9c61b1ac73c8d6dff4ec97dd13fd2b50"
-  integrity sha512-am1A1xYAbENuKJ+zpM7V+B1oRTSeOHYltqVKExznIVFweBzhLmOBmyb1DfIKjHo90E0bo1p3nzVJ2NgS5xh+sQ==
+  version "4.9.4"
+  resolved "https://registry.yarnpkg.com/react-number-format/-/react-number-format-4.9.4.tgz#013ae526000e676e491763ce14da66fb330a9bd8"
+  integrity sha512-Gq20Z3ugqPLFgeaidnx5on9cNpbQZntPN3QgNAL/WJrNNlQnNznY0LCx7g8xtssmRBw0/hw+SCqw6zAcajooiA==
   dependencies:
     prop-types "^15.7.2"
 
@@ -10825,9 +10850,9 @@ react-toastify@^8.0.3:
     clsx "^1.1.1"
 
 react-transition-group@^4.4.0:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
-  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
+  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
@@ -10842,12 +10867,12 @@ react@^17.0.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-cmd-shim@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087"
-  integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==
+read-cmd-shim@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10855,34 +10880,24 @@ read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@*:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa"
-  integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q==
-  dependencies:
-    glob "^8.0.1"
-    json-parse-even-better-errors "^2.3.1"
-    normalize-package-data "^4.0.0"
-    npm-normalize-package-bin "^2.0.0"
-
-read-package-json@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
-  integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
+read-package-json@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
-    glob "^8.0.1"
-    json-parse-even-better-errors "^2.3.1"
-    normalize-package-data "^4.0.0"
-    npm-normalize-package-bin "^1.0.1"
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
 
-read@*, read@1, read@^1.0.7:
+read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   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==
@@ -10924,7 +10939,7 @@ readdir-glob@^1.0.0:
   dependencies:
     minimatch "^5.1.0"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -11125,6 +11140,32 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -11140,6 +11181,11 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
+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"
@@ -11270,7 +11316,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-rimraf@*, rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -11335,7 +11381,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -11411,13 +11457,6 @@ secp256k1@^4.0.0, secp256k1@^4.0.2:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-semver@*, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -11433,6 +11472,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -11447,7 +11493,7 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -11620,10 +11666,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+socks-proxy-agent@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
@@ -11730,9 +11776,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
+  integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
 
 split-on-first@^1.0.0:
   version "1.1.0"
@@ -11751,12 +11797,20 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-ssri@*, ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
+sshpk@^1.7.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
   version "6.0.2"
@@ -11765,7 +11819,7 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -11842,6 +11896,15 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11851,6 +11914,14 @@ string-length@^4.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -11913,6 +11984,11 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -11920,6 +11996,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -12100,7 +12183,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@*, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12160,9 +12243,9 @@ terser@^4.1.2, terser@^4.6.3:
     source-map-support "~0.5.12"
 
 terser@^5.3.4:
-  version "5.14.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
-  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.0.tgz#e16967894eeba6e1091509ec83f0c60e179f2425"
+  integrity sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
@@ -12188,7 +12271,7 @@ text-encoding@^0.7.0:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
   integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==
 
-text-table@*, 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 sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -12218,7 +12301,7 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
-tiny-relative-date@*:
+tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -12288,13 +12371,22 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     safe-regex "^1.1.0"
 
 tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
+
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
 
 tr46@^2.1.0:
   version "2.1.0"
@@ -12313,10 +12405,10 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@*, treeverse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
-  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
@@ -12338,11 +12430,23 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -12377,10 +12481,10 @@ type@^1.0.1:
   resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
-type@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.6.0.tgz#3ca6099af5981d36ca86b78442973694278a219f"
-  integrity sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==
+type@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
 
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
@@ -12467,24 +12571,17 @@ unique-filename@^1.1.1:
   dependencies:
     unique-slug "^2.0.0"
 
-unique-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.0.tgz#c844c84c3b22e92038b0c53950f9dc34d2b55490"
-  integrity sha512-tpzoz2RpZ//6Zt4GPpOFTyrnfZuSvjIfe8lvx6Thp4yTQwJtAFwPlssEBE62VhGA2We5/COyNpcIu+OABu3/Yg==
-  dependencies:
-    unique-slug "^2.0.2"
-
-unique-slug@^2.0.0, unique-slug@^2.0.2:
+unique-slug@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
   integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
-universalify@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
 universalify@^2.0.0:
   version "2.0.0"
@@ -12509,10 +12606,10 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
-  integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
+update-browserslist-db@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz#16279639cff1d0f800b14792de43d97df2d11b7d"
+  integrity sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -12529,6 +12626,14 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -12621,6 +12726,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuidv4@^6.2.13:
   version "6.2.13"
   resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-6.2.13.tgz#8f95ec5ef22d1f92c8e5d4c70b735d1c89572cb7"
@@ -12643,7 +12753,7 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
 
-validate-npm-package-license@^3.0.4:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -12651,18 +12761,27 @@ validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@*, validate-npm-package-name@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
-  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
   dependencies:
-    builtins "^5.0.0"
+    builtins "^1.0.3"
 
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -12743,9 +12862,9 @@ wcwidth@^1.0.0:
     defaults "^1.0.3"
 
 webext-base-css@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/webext-base-css/-/webext-base-css-1.4.1.tgz#3280942f4a05f217b0bb3b2766e199356c059881"
-  integrity sha512-K594dfvWS3rvzkpnlK7nPFp7YZHbOYsxZ62f7A88jma8M8S5NM3WbCAFX7SN6lnJFj/lC8gKmjSjXu6b6Kvm9Q==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/webext-base-css/-/webext-base-css-1.4.2.tgz#bd8e0ee0a81f592ecce9cb6cba915507d8fff838"
+  integrity sha512-Le1bQea6wlkvKIrg0J5MH/EWh0gxRdlR8q9Q1d7pHbHNQ2ltHAaoz/q9UQd1GpEq7i+R5Acd3VGIDVbaUCbxhw==
 
 webextension-polyfill@^0.5.0:
   version "0.5.0"
@@ -12905,13 +13024,6 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
-which@*, which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^1.2.12, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -12919,7 +13031,14 @@ which@^1.2.12, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.5:
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -12966,15 +13085,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@*, write-file-atomic@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -12985,9 +13096,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 write-file-atomic@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
@@ -13061,9 +13172,9 @@ yargs-parser@^18.1.2:
     decamelize "^1.2.0"
 
 yargs-parser@^21.0.0:
-  version "21.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
-  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
 yargs@^15.3.1:
   version "15.4.1"

From 831ea2af213605111322023e99e28cede1163d22 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Thu, 8 Sep 2022 00:42:47 -0300
Subject: [PATCH 024/132] now can download pem file with your account id

---
 source/views/Extension/Views/ExportIdentity/steps/Step2.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
index 52490fa7..e38b57fe 100644
--- a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
+++ b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
@@ -9,6 +9,7 @@ import shortAddress from '@shared/utils/short-address';
 import { useTranslation } from 'react-i18next';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import download from '@shared/utils/download-text';
+import { useSelector } from 'react-redux';
 
 const Step2 = () => {
   const { t } = useTranslation();
@@ -16,6 +17,8 @@ const Step2 = () => {
   const [selectedAccountNumber, setSelectedAccountNumber] = useState(null);
   const [openAccounts, setOpenAccounts] = useState(false);
 
+  const { name } = useSelector((state) => state.wallet);
+
   const handleCloseAccounts = (value) => {
     setOpenAccounts(false);
     setSelectedAccountNumber(value.walletNumber);
@@ -25,7 +28,7 @@ const Step2 = () => {
     sendMessage({ type: HANDLER_TYPES.GET_PEM_FILE, params: selectedAccountNumber },
       (state) => {
         if (state) {
-          download('identity.pem', state);
+          download(`${name}.pem`, state);
         }
       });
   };

From 2b0162f431edf9373f33182f25aaf9bdc1cf314b Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Fri, 9 Sep 2022 10:23:02 -0500
Subject: [PATCH 025/132] Remove custom token (#589)

* Updated controller version

* Added removeToken to Keyring

* Added remove to AssetItem

* Prepopulated protectedAsset

* Added translation for remove token modal

* Renamed Remove to remove custom token
---
 package.json                          |  2 +-
 source/Background/Keyring/index.js    | 11 ++++
 source/components/AssetItem/index.jsx | 80 +++++++++++++++++++++++++--
 source/components/AssetItem/styles.js | 27 +++++++++
 source/components/Tokens/index.jsx    | 16 +++++-
 source/locales/en/translation.json    |  6 ++
 6 files changed, 135 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index b8b59b8c..f172613f 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.10",
+    "@psychedelic/plug-controller": "0.19.11",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 1efc3001..df98288f 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -136,6 +136,7 @@ export const getKeyringErrorMessage = (type) => ({
   [HANDLER_TYPES.REMOVE_NETWORK]: 'removing the network',
   [HANDLER_TYPES.SET_CURRENT_NETWORK]: 'setting the current network',
   [HANDLER_TYPES.GET_CURRENT_NETWORK]: 'getting the current network',
+  [HANDLER_TYPES.REMOVE_CUSTOM_TOKEN]: 'removing custom token',
 }[type]);
 
 export const sendMessage = (args, callback) => {
@@ -434,6 +435,16 @@ export const getKeyringHandler = (type, keyring) => ({
       return { error: e.message };
     }
   },
+  [HANDLER_TYPES.REMOVE_CUSTOM_TOKEN]: async (canisterId) => {
+    try {
+      const newTokens = await keyring.removeToken(canisterId);
+      return Object.values(newTokens);
+    } catch (e) {
+      // eslint-disable-next-line
+      console.log('Error removing the network', e);
+      return { error: e.message };
+    }
+  }
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {
diff --git a/source/components/AssetItem/index.jsx b/source/components/AssetItem/index.jsx
index 20f9e257..6315fbbe 100644
--- a/source/components/AssetItem/index.jsx
+++ b/source/components/AssetItem/index.jsx
@@ -8,17 +8,48 @@ import clsx from 'clsx';
 import Skeleton from 'react-loading-skeleton';
 import 'react-loading-skeleton/dist/skeleton.css';
 
+import { TOKENS } from '@shared/constants/currencies';
 import RefreshIcon from '@assets/icons/blue-refresh.png';
+import DeleteIcon from '@assets/icons/delete.svg';
 import TokenIcon from '../TokenIcon';
+import ActionDialog from '../ActionDialog';
 
 import useStyles from './styles';
 
 const AssetItem = ({
-  updateToken, logo, name, amount, value, symbol, loading, failed, assetNameTestId,
+  updateToken,
+  logo,
+  name,
+  amount,
+  value,
+  symbol,
+  loading,
+  failed,
+  assetNameTestId,
+  protectedAsset,
+  removeAsset,
 }) => {
   const classes = useStyles();
   const { t } = useTranslation();
   const { currentNetwork, usingMainnet } = useSelector((state) => state.network);
+  const [ shouldRemove, setShouldRemove] = useState(false);
+  const [isHovering, setIsHovering] = useState(false);
+  const [openDelete, setOpenDelete] = useState(false);
+
+  const handleMouseOver = () => {
+    if (!protectedAsset) return;
+    setIsHovering(true);
+  };
+
+  const handleMouseOut = () => {
+    if (!protectedAsset) return;
+    setIsHovering(false);
+  };
+
+  const handleModalClose = () => {
+    setIsHovering(false);
+    setOpenDelete(false);
+  };
 
   const handleFetchAssets = async () => {
     // Avoid calling multiple times
@@ -26,9 +57,39 @@ const AssetItem = ({
 
     await updateToken();
   };
+
+  const handleRemoveAssetDisplay = () => {
+    setShouldRemove(true);
+    handleModalClose();
+  }
+
   const ledgerNotSpecified = !usingMainnet && !currentNetwork?.ledgerCanisterId;
+
   return (
-    <div className={clsx(classes.root, failed && classes.failedContainer)}>
+    <div
+      className={clsx(classes.root, failed && classes.failedContainer, shouldRemove && classes.removeAnimation)}
+      onMouseOver={handleMouseOver}
+      onAnimationEnd={removeAsset}
+      onMouseOut={handleMouseOut}
+    >
+      <ActionDialog
+        open={openDelete}
+        title={t('removeToken.action')}
+        content={(
+          <Typography>
+            {t('removeToken.mainText')}
+            <b>{symbol}</b>
+            {t('removeToken.mainTextContinue')}
+            <br />
+            <br />
+            {t('removeToken.disclaimer')}
+          </Typography>
+        )}
+        confirmText={t('removeToken.action')}
+        buttonVariant="danger"
+        onClick={handleRemoveAssetDisplay}
+        onClose={handleModalClose}
+      />
       <TokenIcon className={classes.image} logo={logo} alt={name} symbol={symbol} />
       <div className={classes.leftContainer}>
         {failed && !loading
@@ -75,9 +136,19 @@ const AssetItem = ({
             ? <Skeleton className={classes.valueSkeleton} />
             : (<NumberFormat value={value} displayType="text" decimalScale={2} fixedDecimalScale thousandSeparator="," prefix="$" />)}
         </Typography>
-        )}
+      )}
+      { !failed && !loading && (
+        <div
+          className={clsx(classes.deleteToken, !value && classes.deleteTokenMoveRight, isHovering && classes.deleteTokenActive)}
+        >
+          <img
+            onClick={() => setOpenDelete(true)}
+            alt="delete-token"
+            src={DeleteIcon}
+          />
+        </div>
+      )}
     </div>
-
   );
 };
 
@@ -98,4 +169,5 @@ AssetItem.propTypes = {
   loading: PropTypes.bool.isRequired,
   failed: PropTypes.bool,
   assetNameTestId: PropTypes.string,
+  removeAsset: PropTypes.func.isRequired,
 };
diff --git a/source/components/AssetItem/styles.js b/source/components/AssetItem/styles.js
index ed3d6b0d..79b00a9a 100644
--- a/source/components/AssetItem/styles.js
+++ b/source/components/AssetItem/styles.js
@@ -8,6 +8,13 @@ export default makeStyles((theme) => ({
     justifyContent: 'flex-start',
     padding: `${theme.spacing(1)}px ${theme.spacing(2)}px`,
   },
+  '@keyframes swipeLeft': {
+    from: { transform: 'translateX(0px)' },
+    to: { transform: 'translateX(-100%)' },
+  },
+ removeAnimation: {
+    animation: '$swipeLeft 0.6s forwards',
+  },
   image: {
     height: 41,
     width: 41,
@@ -63,4 +70,24 @@ export default makeStyles((theme) => ({
       opacity: 0.9,
     },
   },
+  deleteToken: {
+    opacity: 0,
+    width: 0,
+    transition: '0.6s',
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  deleteTokenMoveRight: {
+    marginLeft: 'auto !important',
+  },
+  deleteTokenActive: {
+    opacity: 1,
+    margin: '0 4px 0 21px',
+
+    '& > img': {
+      cursor: 'pointer',
+    }
+  }
 }));
diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index d1f9b109..4d898cd7 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -4,6 +4,7 @@ import { Plus } from 'react-feather';
 import { setAssets, setAssetsLoading } from '@redux/wallet';
 import clsx from 'clsx';
 
+import { TOKENS } from '@shared/constants/currencies';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { useRouter } from '@components/Router';
 
@@ -23,10 +24,10 @@ const Tokens = () => {
   const { navigator } = useRouter();
   const { onScroll, fullScroll } = useScroll();
 
-  const fetchAssets = (cb = () => {}) => {
+  const fetchAssets = (cb = () => {}, refresh) => {
     sendMessage({
       type: HANDLER_TYPES.GET_ASSETS,
-      params: {},
+      params: { refresh },
     }, (keyringAssets) => {
       cb(keyringAssets);
       dispatch(setAssets({ keyringAssets, icpPrice }));
@@ -44,6 +45,15 @@ const Tokens = () => {
     });
   };
 
+  const handleRemoveAsset = (canisterId) => {
+    sendMessage({
+      type: HANDLER_TYPES.REMOVE_CUSTOM_TOKEN,
+      params: { canisterId },
+    }, (newTokens) => {
+      fetchAssets();
+    });
+  };
+
   useEffect(() => {
     const id = setInterval(() => {
       !assetsLoading && fetchAssets();
@@ -77,8 +87,10 @@ const Tokens = () => {
           assets?.map((asset) => (
             <AssetItem
               {...asset}
+              removeAsset={() => handleRemoveAsset(asset.canisterId)}
               key={`${asset.symbol}-${asset.canisterId}-${currentNetwork?.id}`}
               updateToken={handleFetchAssets}
+              protectedAsset={!Object.keys(TOKENS).includes(asset.symbol)}
               loading={loading}
               failed={!!asset?.error}
               assetNameTestId="asset-name"
diff --git a/source/locales/en/translation.json b/source/locales/en/translation.json
index c2312647..bc7f2107 100644
--- a/source/locales/en/translation.json
+++ b/source/locales/en/translation.json
@@ -326,6 +326,12 @@
     "selectStandard": "Select the token's interface standard",
     "importTitle": "wants to add a token to your wallet"
   },
+  "removeToken": {
+    "action": "Delete Token",
+    "mainText": "Are you sure you want to delete ",
+    "mainTextContinue": " from your token list?",
+    "disclaimer": "You can always add the token back by adding it as a custom token again."
+  },
   "error": {
     "errorTitle": "Something went wrong",
     "errorBody": "We’re sorry, something weird happened. \nReturn home and retry the action.",

From d4fa694d409fabf272aa4f0e7b289a603516c5b4 Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Fri, 9 Sep 2022 10:23:23 -0500
Subject: [PATCH 026/132] Feat/account switch refactor (#566)

* Added swit account icon

* Added AccountItem component

* Added edit account field

* Added account switch to WalletDetails

* Removed replacing icns on set

* Made profile edit on click

* Added walletId param to icns methods

* Lint fixes for profile

* Added local ICNS data

* Lint fixes

* Added shared transition

* Conditionaly show switch account button
---
 source/Background/Keyring/index.js            |  15 +-
 source/Modules/storageManager.js              |  11 +-
 source/assets/icons/switch-account.svg        |   5 +
 .../Profile/components/AccountItem/index.jsx  |  87 ++++++
 .../Profile/components/AccountItem/styles.js  |  71 +++++
 source/components/Profile/components/index.js |   1 +
 source/components/Profile/index.jsx           |  51 +---
 source/redux/profile.js                       |   6 +-
 source/shared/styles/transitions.js           |   3 +
 .../components/ICNSSelector/index.jsx         |  30 +-
 .../components/ICNSToggle/index.jsx           |  38 ++-
 .../Extension/Views/WalletDetails/index.jsx   | 269 +++++++++++++++---
 .../Extension/Views/WalletDetails/styles.js   |  41 ++-
 13 files changed, 514 insertions(+), 114 deletions(-)
 create mode 100644 source/assets/icons/switch-account.svg
 create mode 100644 source/components/Profile/components/AccountItem/index.jsx
 create mode 100644 source/components/Profile/components/AccountItem/styles.js
 create mode 100644 source/components/Profile/components/index.js
 create mode 100644 source/shared/styles/transitions.js

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index df98288f..82f63e56 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -325,19 +325,22 @@ export const getKeyringHandler = (type, keyring) => ({
       return { error: e.message };
     }
   },
-  [HANDLER_TYPES.GET_ICNS_DATA]: async ({ refresh }) => {
-    const { wallets, currentWalletId } = await keyring.getState();
-    let icnsData = wallets?.[currentWalletId]?.icnsData || { names: [] };
+  [HANDLER_TYPES.GET_ICNS_DATA]: async ({ refresh, walletId = keyring.currentWalletId }) => {
+    const { wallets } = await keyring.getState();
+    let icnsData = wallets?.[walletId]?.icnsData || { names: [] };
     if (!icnsData?.names?.length || refresh) {
-      icnsData = await keyring.getICNSData();
+      icnsData = await keyring.getICNSData({ subaccount: walletId });
     } else {
       keyring.getICNSData();
     }
     return icnsData;
   },
-  [HANDLER_TYPES.SET_REVERSE_RESOLVED_NAME]: async (name) => {
+  [HANDLER_TYPES.SET_REVERSE_RESOLVED_NAME]: async ({
+    name,
+    walletId = keyring.currentWalletId,
+  }) => {
     try {
-      const res = await keyring.setReverseResolvedName({ name });
+      const res = await keyring.setReverseResolvedName({ name, subaccount: walletId });
       return res;
     } catch (e) {
       // eslint-disable-next-line
diff --git a/source/Modules/storageManager.js b/source/Modules/storageManager.js
index dd8f8665..cf95730b 100644
--- a/source/Modules/storageManager.js
+++ b/source/Modules/storageManager.js
@@ -121,7 +121,16 @@ export const getProtectedIds = (cb) => {
 
 export const setUseICNS = (useICNS, walletNumber, cb = () => {}) => {
   const defaultValue = true;
-  secureSetWrapper({ icns: { [walletNumber]: useICNS } }, defaultValue, cb);
+
+  secureGetWrapper('icns', defaultValue, (state) => {
+    cb(state?.icns?.[parseInt(walletNumber, 10)] ?? defaultValue);
+    secureSetWrapper({
+      icns: {
+        ...state?.icns,
+        [walletNumber]: useICNS,
+      },
+    }, defaultValue, cb);
+  });
 };
 
 export const getUseICNS = (walletNumber, cb) => {
diff --git a/source/assets/icons/switch-account.svg b/source/assets/icons/switch-account.svg
new file mode 100644
index 00000000..c08325d8
--- /dev/null
+++ b/source/assets/icons/switch-account.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.4 11.9525C4.4 9.739 5.369 7.7535 6.889 6.3665L9.15 8.6275V2.9275H3.45L5.54 5.0175C3.678 6.7465 2.5 9.207 2.5 11.9525C2.5 16.883 6.2525 20.93 11.05 21.405V19.486C7.307 19.0205 4.4 15.819 4.4 11.9525ZM21.5 11.9525C21.5 7.022 17.7475 2.975 12.95 2.5V4.419C16.693 4.8845 19.6 8.086 19.6 11.9525C19.6 14.166 18.631 16.1515 17.111 17.5385L14.85 15.2775V20.9775H20.55L18.46 18.8875C20.322 17.1585 21.5 14.698 21.5 11.9525Z" fill="#3574F4"/>
+<path d="M14.3497 12.3918C13.7013 12.1092 12.9033 11.8931 12 11.8931C11.0967 11.8931 10.2987 12.1092 9.65032 12.3974C9.05182 12.6578 8.67499 13.2563 8.67499 13.9103V14.8025H15.325V13.9047C15.325 13.2563 14.9482 12.6578 14.3497 12.3918Z" fill="#3574F4"/>
+<path d="M13.6625 9.81497C13.6625 8.89505 12.9199 8.15247 12 8.15247C11.0801 8.15247 10.3375 8.89505 10.3375 9.81497C10.3375 10.7349 11.0801 11.4775 12 11.4775C12.9199 11.4775 13.6625 10.7349 13.6625 9.81497Z" fill="#3574F4"/>
+</svg>
diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
new file mode 100644
index 00000000..0f62a02d
--- /dev/null
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -0,0 +1,87 @@
+import React from 'react';
+import clsx from 'clsx';
+import { IconButton } from '@material-ui/core';
+import { useDispatch } from 'react-redux';
+import { useHiddenAccounts, toggleAccountHidden } from '@redux/profile';
+
+import BluePencil from '@assets/icons/blue-pencil.svg';
+import InvisibleIcon from '@assets/icons/invisible.svg';
+import SwitchAccount from '@assets/icons/switch-account.svg';
+import VisibleIcon from '@assets/icons/visible.svg';
+
+import UserIcon from '../../../UserIcon';
+import useStyles from './styles';
+
+const AccountItem = ({
+  account,
+  isCurrentAccount,
+  isEditing,
+  handleChangeAccount,
+  handleEditAccount,
+}) => {
+  const classes = useStyles();
+  const hiddenAccounts = useHiddenAccounts();
+  const dispatch = useDispatch();
+
+  const isHidden = hiddenAccounts.includes(account.walletNumber);
+
+  const toggleAccountVisibility = (account) => (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    dispatch(toggleAccountHidden(account));
+  };
+
+  if (isHidden && !isEditing) return null;
+
+  return (
+    <div
+      className={clsx(classes.accountItemContainer, isHidden && classes.hiddenAccount)}
+      itemNameTestId="account-name"
+      onClick={handleEditAccount(account)}
+    >
+      <div className={classes.leftContainer}>
+        <UserIcon
+          size="small"
+          icon={account.icon ? account.icon : '👽'}
+          style={{ marginLeft: -6, marginRight: 12 }}
+        />
+        <div
+          className={classes.accountDetails}
+        >
+          <span className={classes.accountName}>
+            {account.name}
+          </span>
+        </div>
+      </div>
+      <div className={classes.rightContainer}>
+        <IconButton
+          disabled={isCurrentAccount || isHidden}
+          onClick={handleChangeAccount(account.walletNumber)}
+        >
+          <img
+            className={clsx((isCurrentAccount || isHidden) && classes.disabledIcon)}
+            src={SwitchAccount}
+          />
+        </IconButton>
+        <IconButton
+          disabled={isHidden}
+          onClick={handleEditAccount(account)}
+        >
+          <img
+            className={clsx(isHidden && classes.disabledIcon)}
+            src={BluePencil}
+          />
+        </IconButton>
+        { isEditing && (
+          <IconButton
+            onClick={toggleAccountVisibility(account.walletNumber)}
+          >
+            <img src={isHidden ? InvisibleIcon : VisibleIcon} />
+          </IconButton>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default AccountItem;
diff --git a/source/components/Profile/components/AccountItem/styles.js b/source/components/Profile/components/AccountItem/styles.js
new file mode 100644
index 00000000..11e12e71
--- /dev/null
+++ b/source/components/Profile/components/AccountItem/styles.js
@@ -0,0 +1,71 @@
+import { makeStyles } from '@material-ui/core/styles';
+import SMOOTH_TRANSITION from '@shared/styles/transitions'; 
+
+export default makeStyles(() => ({
+  accountItemContainer: {
+    width: '100%',
+    height: '52px',
+    padding: '8px 21px 8px 27px',
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    cursor: 'pointer',
+    color: '#000000',
+    transition: `${SMOOTH_TRANSITION}`,
+
+    '&:hover': {
+      background: 'linear-gradient(94.95deg, rgba(255, 231, 1, 0.12) -1.41%, rgba(250, 81, 211, 0.12) 34.12%, rgba(16, 217, 237, 0.12) 70.19%, rgba(82, 255, 83, 0.12) 101.95%)',
+
+      '& > div:last-child': {
+        opacity: '1 !important',
+      },
+    },
+  },
+  hiddenAccount: {
+    color: 'rgba(0, 0, 0, 0.26)',
+    opacity: 0.7,
+  },
+  leftContainer: {
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+  },
+  accountDetails: {
+    display: 'flex',
+    flexDirection: 'column',
+    marginLeft: '-3px',
+  },
+  accountName: {
+    fontWeight: '500',
+    fontSize: '14px',
+    lineHeight: '20px',
+  },
+  accountType: {
+    fontWeight: 500,
+    fontSize: '12px',
+    lineHeight: '20px',
+    color: 'rgba(0, 0, 0, 0.4)',
+  },
+  rightContainer: {
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    opacity: '0',
+
+    transition: `${SMOOTH_TRANSITION}`,
+    '& > button': {
+      padding: '5px',
+      '& > span': {
+        width: '24px',
+        height: '24px',
+      },
+    },
+  },
+  disabledIcon: {
+    opacity: 0.3,
+  },
+
+}));
diff --git a/source/components/Profile/components/index.js b/source/components/Profile/components/index.js
new file mode 100644
index 00000000..d988ab67
--- /dev/null
+++ b/source/components/Profile/components/index.js
@@ -0,0 +1 @@
+export { default as AccountItem } from './AccountItem';
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index be759d8e..cbeaab6f 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import Drawer from '@material-ui/core/Drawer';
 import Divider from '@material-ui/core/Divider';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import { IconButton, Typography } from '@material-ui/core';
+import { Typography } from '@material-ui/core';
 import clsx from 'clsx';
 import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
@@ -19,13 +19,10 @@ import {
   setCollections,
   setTransactions,
 } from '@redux/wallet';
-import BluePencil from '@assets/icons/blue-pencil.svg';
-import VisibleIcon from '@assets/icons/visible.svg';
-import InvisibleIcon from '@assets/icons/invisible.svg';
 import { getRandomEmoji } from '@shared/constants/emojis';
 import { getTabURL } from '@shared/utils/chrome-tabs';
 import { getWalletsConnectedToUrl, getApp } from '@modules/storageManager';
-import { toggleAccountHidden, useHiddenAccounts } from '@redux/profile';
+import { setEditAccount, toggleAccountHidden, useHiddenAccounts } from '@redux/profile';
 import { setICNSData } from '@redux/icns';
 import { useICPPrice } from '@redux/icp';
 import { useMenuItems, useContacts } from '@hooks';
@@ -37,6 +34,7 @@ import TextInput from '../TextInput';
 import LinkButton from '../LinkButton';
 import { TABS, useRouter } from '../Router';
 import ActionDialog from '../ActionDialog';
+import { AccountItem } from './components';
 import UserIcon from '../UserIcon';
 import useStyles from './styles';
 
@@ -69,8 +67,6 @@ const Profile = ({ disableProfile }) => {
 
   const menuItems = disableProfile ? [] : useMenuItems(handleToggle);
 
-  const hiddenAccounts = useHiddenAccounts();
-
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
@@ -89,9 +85,10 @@ const Profile = ({ disableProfile }) => {
     }
   };
 
-  const handleEditAccount = (e) => {
+  const handleEditAccount = (account) => (e) => {
     e.preventDefault();
     e.stopPropagation();
+    dispatch(setEditAccount(account));
     setOpen(false);
     navigator.navigate('wallet-details');
   };
@@ -114,12 +111,6 @@ const Profile = ({ disableProfile }) => {
     setIsEditing(!isEditing);
   };
 
-  const toggleAccountVisibility = (account) => (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    dispatch(toggleAccountHidden(account));
-  };
-
   const executeAccountSwitch = (wallet) => {
     dispatch(setCollections({ collections: [], principalId }));
     sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: wallet },
@@ -272,31 +263,19 @@ const Profile = ({ disableProfile }) => {
               <MenuList className={clsx(classes.accountContainer, classes.menu)}>
                 {
                   accounts.map((account) => {
-                    const isHidden = hiddenAccounts.includes(account.walletNumber);
-                    const isExactWalletNumber = account.walletNumber === walletNumber;
-                    return (!isHidden || isEditing) && (
-                      <MenuItem
-                        size="small"
-                        key={account.walletNumber}
-                        name={account.name}
-                        icon={<UserIcon size="small" icon={account.icon ? account.icon : '👽'} style={{ marginLeft: -6, marginRight: 12 }} />}
-                        onClick={!isHidden && handleChangeAccount(account.walletNumber)}
-                        selected={isExactWalletNumber}
-                        className={clsx(isHidden && classes.hiddenAccount)}
-                        itemNameTestId="account-name"
-                        endIcon={isExactWalletNumber ? (
-                          <IconButton data-testid={`edit-button-${account.name}`} onClick={handleEditAccount}>
-                            <img src={BluePencil} />
-                          </IconButton>
-                        ) : isEditing ? (
-                          <IconButton data-testid={`visibility-button-${account.name}`} onClick={toggleAccountVisibility(account.walletNumber)}>
-                            <img src={isHidden ? InvisibleIcon : VisibleIcon} />
-                          </IconButton>
-                        ) : null}
+                    const isCurrentAccount = account.walletNumber === walletNumber;
+
+                    return (
+                      <AccountItem
+                        account={account}
+                        isEditing={isEditing}
+                        isCurrentAccount={isCurrentAccount}
+                        handleChangeAccount={handleChangeAccount}
+                        handleEditAccount={handleEditAccount}
                       />
                     );
                   })
-                }
+}
               </MenuList>
               <MenuList className={clsx(classes.settingContainer, classes.menu)}>
                 <Divider style={{ margin: '6px 0' }} />
diff --git a/source/redux/profile.js b/source/redux/profile.js
index 6a8b1019..d3c3919b 100644
--- a/source/redux/profile.js
+++ b/source/redux/profile.js
@@ -11,6 +11,7 @@ export const profileSlice = createSlice({
   name: 'profile',
   initialState: {
     hiddenAccounts: [],
+    editAccount: {},
   },
   reducers: {
     setHiddenAccounts: (state, action) => {
@@ -25,10 +26,13 @@ export const profileSlice = createSlice({
       }
       setStorageHiddenAccounts(Object.values(state.hiddenAccounts));
     },
+    setEditAccount: (state, action) => {
+      state.editAccount = action.payload;
+    },
   },
 });
 
-export const { setHiddenAccounts, toggleAccountHidden } = profileSlice.actions;
+export const { setHiddenAccounts, toggleAccountHidden, setEditAccount } = profileSlice.actions;
 
 /**
  * @description Hook that fetches hidden accounts from storage and sets them in the state.
diff --git a/source/shared/styles/transitions.js b/source/shared/styles/transitions.js
new file mode 100644
index 00000000..a38c8f71
--- /dev/null
+++ b/source/shared/styles/transitions.js
@@ -0,0 +1,3 @@
+const SMOOTH_TRANSITION = 'all 150ms cubic-bezier(0.4, 0, 0.2, 1) 0ms';
+
+export default SMOOTH_TRANSITION;
diff --git a/source/views/Extension/Views/WalletDetails/components/ICNSSelector/index.jsx b/source/views/Extension/Views/WalletDetails/components/ICNSSelector/index.jsx
index 4ee5925d..fb02311b 100644
--- a/source/views/Extension/Views/WalletDetails/components/ICNSSelector/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/components/ICNSSelector/index.jsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 import clsx from 'clsx';
-import { useDispatch, useSelector } from 'react-redux';
 import { Typography, CircularProgress } from '@material-ui/core';
 import { ChevronDown } from 'react-feather';
 
@@ -10,12 +9,10 @@ import { InputBase, Dialog } from '@components';
 
 import useStyles from './styles';
 
-const ICNSSelector = () => {
+const ICNSSelector = ({ names, resolved, handleSetReverseResolution, loading }) => {
   const classes = useStyles();
-  const { names, resolved } = useSelector((state) => state.icns);
   const [isOpen, setIsOpen] = useState(false);
   const [nameLoading, setLoading] = useState();
-  const dispatch = useDispatch();
   const openSelectDialog = () => names?.length && setIsOpen(true);
 
   const resetModal = () => {
@@ -30,26 +27,17 @@ const ICNSSelector = () => {
       resetModal();
     }
 
-    sendMessage({
-      type: HANDLER_TYPES.SET_REVERSE_RESOLVED_NAME,
-      params: name,
-    }, (response) => {
-      if (response.error) {
-        // eslint-disable-next-line
-        console.log('Error when setting your reverse resolved name', response.error); // TODO HANDLE ERROR (shouldnt happen tho)
-      } else {
-        sendMessage({
-          type: HANDLER_TYPES.GET_ICNS_DATA,
-          params: { refresh: true },
-        }, (icnsData) => {
-          dispatch(setICNSData(icnsData));
-          resetModal();
-        });
-      }
-    });
+    handleSetReverseResolution(name, resetModal);
   };
 
   const getInputContent = () => {
+    if (loading) {
+      return (
+        <Typography variant="subtitle2">
+          Loading ICNS data...
+        </Typography>
+      );
+    }
     if (names?.length === 0) {
       return (
         <Typography variant="subtitle2">
diff --git a/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx b/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx
index 5f5d995d..95d70b12 100644
--- a/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx
@@ -1,5 +1,4 @@
 import React, { useState } from 'react';
-import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { Info } from 'react-feather';
@@ -13,10 +12,16 @@ import useStyles from './styles';
 import ICNSSelector from '../ICNSSelector';
 import InfoModal from '../InfoModal';
 
-const ICNSToggle = ({ active, handleToggle }) => {
+const ICNSToggle = ({
+  active,
+  handleToggle,
+  names,
+  resolved,
+  loading,
+  handleSetReverseResolution,
+}) => {
   const classes = useStyles();
   const { t } = useTranslation();
-  const { names } = useSelector((state) => state.icns);
   const [infoOpen, setInfoOpen] = useState(false);
 
   return (
@@ -46,18 +51,23 @@ const ICNSToggle = ({ active, handleToggle }) => {
           />
         </div>
         {active && (
-        <>
-          <ICNSSelector />
-          {!names?.length && (
-            <Button
-              onClick={() => extension.tabs.create({ url: 'https://icns.id' })}
-              value={t('walletDetails.getICNS')}
-              fullWidth
-              variant="blue"
-              wrapperStyle={{ textAlign: 'center' }}
+          <>
+            <ICNSSelector
+              names={names}
+              resolved={resolved}
+              loading={loading}
+              handleSetReverseResolution={handleSetReverseResolution}
             />
-          )}
-        </>
+            {!names?.length && !loading && (
+              <Button
+                onClick={() => extension.tabs.create({ url: 'https://icns.id' })}
+                value={t('walletDetails.getICNS')}
+                fullWidth
+                variant="blue"
+                wrapperStyle={{ textAlign: 'center' }}
+              />
+            )}
+          </>
         )}
       </div>
       <InfoModal
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 24287508..b7616d19 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -6,21 +6,36 @@ import { useSelector, useDispatch } from 'react-redux';
 import InputBase from '@material-ui/core/InputBase';
 import { ChevronDown } from 'react-feather';
 import { toast } from 'react-toastify';
+import extensionizer from 'extensionizer';
 
+import { getWalletsConnectedToUrl, getApp, getUseICNS } from '@modules/storageManager';
+import { getTabURL } from '@shared/utils/chrome-tabs';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import { updateWalletDetails } from '@redux/wallet';
+import {
+  setAccountInfo,
+  setAssets,
+  setAssetsLoading,
+  setCollections,
+  setTransactions,
+  updateWalletDetails,
+} from '@redux/wallet';
+import { useICPPrice } from '@redux/icp';
+import { setICNSData, setUseICNS as setReduxUseICNS } from '@redux/icns';
+import { useContacts } from '@hooks';
+
 import BlueCheck from '@assets/icons/blue-check.svg';
 import Pencil from '@assets/icons/pencil.svg';
-import { useRouter } from '@components/Router';
+import SwitchAccount from '@assets/icons/switch-account.svg';
+import { TABS, useRouter } from '@components/Router';
+
 import {
   Layout,
   UserIcon,
-
+  ConnectAccountsModal,
   Header,
   LinkButton,
 } from '@components';
-import { setUseICNS } from '@modules/storageManager';
-import { setICNSData, setUseICNS as setReduxUseICNS } from '@redux/icns';
+import { setUseICNS as setStorageUseICNS} from '@modules/storageManager';
 
 import useStyles from './styles';
 import DetailItem from './components/DetailItem';
@@ -28,24 +43,69 @@ import ICNSToggle from './components/ICNSToggle';
 
 const WalletDetails = () => {
   const classes = useStyles();
-  const {
-    name, emoji, accountId, principalId, walletNumber,
-  } = useSelector((state) => state.wallet);
-  const { resolved, useICNS } = useSelector((state) => state.icns);
   const { navigator } = useRouter();
   const { t } = useTranslation();
+  const {
+    resolved: reduxResolved,
+    useICNS: reduxUseICNS,
+    names: reduxNames,
+  } = useSelector((state) => state.icns);
+  const dispatch = useDispatch();
+  const { getContacts } = useContacts();
+  const icpPrice = useICPPrice();
+
+  const { editAccount } = useSelector((state) => state.profile);
+  const { walletNumber: activeWalletNumber } = useSelector((state => state.wallet));
+
+  const textInput = useRef(null);
+  const { name, icon: emoji, accountId, principal: principalId, walletNumber } = editAccount;
+
+  const [openConnectAccount, setOpenConnectAccount] = useState(false);
+  const [connectedWallets, setConnectedWallets] = useState([]);
+  const [tab, setTab] = useState(null);
+  const [app, setApp] = useState(null);
+  const [accountSwitchId, setAccountSwitchId] = useState(walletNumber);
+  const [accounts, setAccounts] = useState([]);
   const [openEmojis, setOpenEmojis] = useState(false);
   const [walletName, setWalletName] = useState(name);
   const [currentEmoji, setCurrentEmoji] = useState(emoji);
   const [edit, setEdit] = useState(false);
   const [expand, setExpand] = useState(false);
-
   const [openAccount, setOpenAccount] = useState(false);
   const [openPrincipal, setOpenPrincipal] = useState(false);
 
-  const textInput = useRef(null);
+  // Local ICNS
+  const [useICNS, setUseICNS] = useState(false);
+  const [resolved, setResolved] = useState(null);
+  const [icnsNames, setICNSNames] = useState([]);
+  const [icnsLoading, setICNSLoading] = useState(true);
 
-  const dispatch = useDispatch();
+  const hasActiveResolvedICNS = resolved !== null && useICNS && !icnsLoading;
+
+  useEffect(() => {
+    setICNSLoading(true);
+    // Use standard ICNS data
+    if (walletNumber === activeWalletNumber) {
+      setICNSLoading(false);
+      setUseICNS(reduxUseICNS);
+      setResolved(reduxResolved);
+      setICNSNames(reduxNames);
+    } else {
+      getUseICNS(walletNumber, (storageUseICNS) => {
+        setUseICNS(storageUseICNS);
+      });
+
+      sendMessage({
+        type: HANDLER_TYPES.GET_ICNS_DATA,
+        params: { refresh: true, walletId: walletNumber },
+      }, (icnsData) => {
+        const { names, reverseResolvedName } = icnsData;
+        setICNSNames(names || []);
+        setResolved(reverseResolvedName || null);
+        setICNSLoading(false);
+      });
+    }
+  }, [walletNumber]);
 
   const handleChange = (e) => setWalletName(e.target.value);
 
@@ -78,10 +138,12 @@ const WalletDetails = () => {
           },
         },
         () => {
-          dispatch(updateWalletDetails({
-            name: walletName,
-            emoji: currentEmoji,
-          }));
+          if (activeWalletNumber === walletNumber) {
+            dispatch(updateWalletDetails({
+              name: walletName,
+              emoji: currentEmoji,
+            }));
+          }
           setWalletName(walletName);
           setCurrentEmoji(currentEmoji);
         },
@@ -91,28 +153,136 @@ const WalletDetails = () => {
 
   const handleToggleICNS = (event) => {
     const { checked } = event.target;
-    dispatch(setReduxUseICNS(checked));
-    setUseICNS(checked, walletNumber);
+
+    setUseICNS(checked);
+    setStorageUseICNS(checked, walletNumber);
+    if (walletNumber === activeWalletNumber) {
+      dispatch(setReduxUseICNS(checked));
+    }
+
     if (!checked) {
       sendMessage({
         type: HANDLER_TYPES.SET_REVERSE_RESOLVED_NAME,
-        params: '',
+        params: { name: '', walletId: walletNumber },
       }, (response) => {
         if (response.error) {
           // eslint-disable-next-line
           console.log('Error when resetting your reverse resolved name', response.error); // TODO HANDLE ERROR (shouldnt happen tho)
         } else {
+          sendMessage({
+            type: HANDLER_TYPES.GET_ICNS_DATA,
+            params: { refresh: true, walletId: walletNumber },
+          }, (icnsData) => {
+            if (walletNumber === activeWalletNumber) {
+              dispatch(setICNSData(icnsData));
+            }
+
+            const { names, reverseResolvedName } = icnsData;
+            setICNSNames(names || []);
+            setResolved(reverseResolvedName || null);
+            setICNSLoading(false);
+          });
+        }
+      });
+    }
+  };
+
+  const handleSetReverseResolution = (name, resetModal) => {
+    sendMessage({
+      type: HANDLER_TYPES.SET_REVERSE_RESOLVED_NAME,
+      params: { name, walletId: walletNumber },
+    }, (response) => {
+      if (response.error) {
+        // eslint-disable-next-line
+        console.log('Error when setting your reverse resolved name', response.error); // TODO HANDLE ERROR (shouldnt happen tho)
+      } else {
+        sendMessage({
+          type: HANDLER_TYPES.GET_ICNS_DATA,
+          params: { refresh: true, walletId: walletNumber },
+        }, (icnsData) => {
+          if (walletNumber === activeWalletNumber) {
+            dispatch(setICNSData(icnsData));
+          }
+
+          const { names, reverseResolvedName } = icnsData;
+          setICNSNames(names || []);
+          setResolved(reverseResolvedName || null);
+          setICNSLoading(false);
+          resetModal();
+        });
+      }
+    });
+  }
+
+  const handleChangeAccount = () => {
+    extensionizer.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => {
+      const url = getTabURL(tabs?.[0]);
+      const ids = accounts.map((_, idx) => idx);
+      setTab(tabs?.[0]);
+      // Check if new wallet is connected to the current page
+      setAccountSwitchId(walletNumber);
+
+      getWalletsConnectedToUrl(url, ids, async (wallets = []) => {
+        const currentConnected = wallets.includes(activeWalletNumber);
+        const newConnected = wallets.includes(walletNumber);
+
+        setConnectedWallets(wallets);
+
+        getApp(activeWalletNumber.toString(), url, (currentApp) => {
+          setApp(currentApp);
+          // If current was connected but new one isnt, prompt modal
+          if (currentConnected && !newConnected) {
+            setOpenConnectAccount(true);
+          } else {
+            executeAccountSwitch(walletNumber);
+          }
+        });
+      });
+    });
+  };
+
+  const executeAccountSwitch = (wallet) => {
+    dispatch(setCollections({ collections: [], principalId }));
+    sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: accountSwitchId },
+      (state) => {
+        if (state?.wallets?.length) {
+          const newWallet = state.wallets[state.currentWalletId];
+          dispatch(setAccountInfo(newWallet));
+          getContacts();
+          dispatch(setICNSData(newWallet.icnsData));
+          dispatch(setAssetsLoading(true));
+          dispatch(setTransactions([]));
           sendMessage({
             type: HANDLER_TYPES.GET_ICNS_DATA,
             params: { refresh: true },
           }, (icnsData) => {
             dispatch(setICNSData(icnsData));
           });
+          sendMessage({
+            type: HANDLER_TYPES.GET_ASSETS,
+            params: { refresh: true },
+          }, (keyringAssets) => {
+            dispatch(setAssets({ keyringAssets, icpPrice }));
+            dispatch(setAssetsLoading(false));
+          });
+          navigator.navigate('home', TABS.TOKENS);
         }
       });
-    }
+  };
+
+  const handleDeclineConnect = () => {
+    executeAccountSwitch(activeWalletNumber);
+    setOpenConnectAccount(false);
   };
 
+  useEffect(() => {
+    sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
+      if (state?.wallets?.length) {
+        setAccounts(state.wallets);
+      }
+    });
+  }, []);
+
   useEffect(() => {
     sendMessage({
       type: HANDLER_TYPES.GET_ICNS_DATA,
@@ -122,7 +292,11 @@ const WalletDetails = () => {
     });
   }, []);
 
-  const hasActiveResolvedICNS = resolved && useICNS;
+  useEffect(() => {
+    setWalletName(editAccount.name);
+    setCurrentEmoji(editAccount.icon);
+  }, [editAccount]);
+
   return (
     <Layout>
       <Header
@@ -135,6 +309,15 @@ const WalletDetails = () => {
           />
         )}
       />
+      <ConnectAccountsModal
+        open={openConnectAccount}
+        onClose={handleDeclineConnect}
+        onConfirm={() => executeAccountSwitch(walletNumber)}
+        wallets={accounts}
+        connectedWallets={connectedWallets}
+        app={app}
+        tab={tab}
+      />
       <div className={classes.walletDetailsContainer}>
         <div className={clsx(classes.avatarContainer, edit && classes.avatarEdit)}>
           <UserIcon
@@ -147,7 +330,7 @@ const WalletDetails = () => {
           <InputBase
             classes={{
               root:
-              clsx(classes.name, edit && !hasActiveResolvedICNS && classes.nameEdit),
+              clsx(classes.name, edit && !hasActiveResolvedICNS && classes.nameEdit, edit && hasActiveResolvedICNS && classes.resolvedNameEdit),
             }}
             value={hasActiveResolvedICNS ? resolved : walletName}
             type="text"
@@ -171,17 +354,27 @@ const WalletDetails = () => {
               </button>
             )
             : (
-              <button
-                type="button"
-                style={{ all: 'unset', marginTop: '4px' }}
-                data-testid="edit-icon-button"
-                onClick={openEditWalletName}
-              >
-                <img
-                  className={classes.icon}
-                  src={Pencil}
-                />
-              </button>
+              <div className={classes.buttonsContainer}>
+                { walletNumber !== activeWalletNumber && (
+                  <button
+                    type="button"
+                    data-testid="edit-icon-button"
+                    onClick={handleChangeAccount}
+                  >
+                    <img
+                      src={SwitchAccount}
+                    />
+                  </button>
+                )}
+                <button
+                  type="button"
+                  onClick={openEditWalletName}
+                >
+                  <img
+                    src={Pencil}
+                  />
+                </button>
+              </div>
             )}
         </div>
         {openEmojis && edit && (
@@ -204,7 +397,15 @@ const WalletDetails = () => {
             }}
           />
         )}
-        <ICNSToggle active={useICNS} handleToggle={handleToggleICNS} />
+        <ICNSToggle
+          active={useICNS}
+          names={icnsNames}
+          resolved={resolved}
+          handleToggle={handleToggleICNS}
+          walletNumber={walletNumber}
+          loading={icnsLoading}
+          handleSetReverseResolution={handleSetReverseResolution}
+        />
         <div
           className={classes.viewMore}
           onClick={toggleExpand}
diff --git a/source/views/Extension/Views/WalletDetails/styles.js b/source/views/Extension/Views/WalletDetails/styles.js
index 8de0ef76..7931e873 100644
--- a/source/views/Extension/Views/WalletDetails/styles.js
+++ b/source/views/Extension/Views/WalletDetails/styles.js
@@ -1,5 +1,6 @@
 import { makeStyles } from '@material-ui/core/styles';
 import SHADOW_1 from '@shared/styles/shadows';
+import SMOOTH_TRANSITION from '@shared/styles/transitions'; 
 
 export default makeStyles((theme) => ({
   badge: {
@@ -29,7 +30,7 @@ export default makeStyles((theme) => ({
     border: '1px solid #F3F4F6',
   },
   name: {
-    width: 231,
+    width: 162,
     height: 41,
     padding: '0 12px',
     borderRadius: 6,
@@ -39,9 +40,13 @@ export default makeStyles((theme) => ({
     marginRight: 10,
   },
   nameEdit: {
+    width: 231,
     background: '#FFFFFF',
     boxShadow: '0px 1px 2px rgba(0, 0, 0, 0.05)',
   },
+  resolvedNameEdit: {
+    width: 231,
+  },
   icon: {
     marginLeft: 3,
     marginRight: 12,
@@ -128,4 +133,38 @@ export default makeStyles((theme) => ({
     flexDirection: 'column',
     alignItems: 'center',
   },
+  buttonsContainer: {
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+    paddingRight: '16px',
+    width: '112px',
+
+    '& > button': {
+      width: '40px',
+      height: '40px',
+      background: 'rgba(53, 116, 244, 0.08)',
+      border: 'none',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      margin: '0px 4px',
+      borderRadius: '6px',
+      cursor: 'pointer',
+      transition: `${SMOOTH_TRANSITION}`,
+
+      '& > img': {
+        transition: `${SMOOTH_TRANSITION}`,
+      },
+
+      '&:hover': {
+        background: '#3574F4',
+
+        '& > img': {
+          filter: 'brightness(0) saturate(100) invert(1)',
+        },
+      },
+    }
+  },
 }));

From ebc351701707912fdbbb41168084b561536c3d42 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Fri, 9 Sep 2022 13:51:32 -0300
Subject: [PATCH 027/132] disable edit name while using icns

---
 .../Profile/components/AccountItem/index.jsx  |  2 +-
 .../Extension/Views/WalletDetails/index.jsx   | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 0f62a02d..7b09255f 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -49,7 +49,7 @@ const AccountItem = ({
           className={classes.accountDetails}
         >
           <span className={classes.accountName}>
-            {account.name}
+            {account.icnsData.reverseResolvedName ? account.icnsData.reverseResolvedName : account.name }
           </span>
         </div>
       </div>
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index b7616d19..67a8d3c5 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -82,6 +82,12 @@ const WalletDetails = () => {
 
   const hasActiveResolvedICNS = resolved !== null && useICNS && !icnsLoading;
 
+  useEffect(() => {
+    if (useICNS) {
+      handleEditWalletName();
+    }
+  }, [useICNS]);
+
   useEffect(() => {
     setICNSLoading(true);
     // Use standard ICNS data
@@ -127,7 +133,11 @@ const WalletDetails = () => {
     } else {
       setEdit(false);
       setOpenEmojis(false);
-
+      console.log({
+        walletNumber,
+        name: walletName,
+        emoji: currentEmoji,
+      })
       sendMessage(
         {
           type: HANDLER_TYPES.EDIT_PRINCIPAL,
@@ -155,6 +165,8 @@ const WalletDetails = () => {
     const { checked } = event.target;
 
     setUseICNS(checked);
+    console.log(useICNS);
+
     setStorageUseICNS(checked, walletNumber);
     if (walletNumber === activeWalletNumber) {
       dispatch(setReduxUseICNS(checked));
@@ -366,14 +378,16 @@ const WalletDetails = () => {
                     />
                   </button>
                 )}
-                <button
-                  type="button"
-                  onClick={openEditWalletName}
-                >
-                  <img
-                    src={Pencil}
-                  />
-                </button>
+                {
+                  !useICNS && (<button
+                    type="button"
+                    onClick={openEditWalletName}
+                  >
+                    <img
+                      src={Pencil}
+                    />
+                  </button>)
+                }
               </div>
             )}
         </div>

From 4e2cf9622e4fadf888ee824e0c1d2ab3c51d91fa Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Fri, 9 Sep 2022 14:37:38 -0300
Subject: [PATCH 028/132] removed clgs and moved useEffect

---
 .../views/Extension/Views/WalletDetails/index.jsx   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 67a8d3c5..0fb1cde3 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -82,12 +82,6 @@ const WalletDetails = () => {
 
   const hasActiveResolvedICNS = resolved !== null && useICNS && !icnsLoading;
 
-  useEffect(() => {
-    if (useICNS) {
-      handleEditWalletName();
-    }
-  }, [useICNS]);
-
   useEffect(() => {
     setICNSLoading(true);
     // Use standard ICNS data
@@ -165,7 +159,6 @@ const WalletDetails = () => {
     const { checked } = event.target;
 
     setUseICNS(checked);
-    console.log(useICNS);
 
     setStorageUseICNS(checked, walletNumber);
     if (walletNumber === activeWalletNumber) {
@@ -309,6 +302,12 @@ const WalletDetails = () => {
     setCurrentEmoji(editAccount.icon);
   }, [editAccount]);
 
+  useEffect(() => {
+    if (useICNS) {
+      handleEditWalletName();
+    }
+  }, [useICNS]);
+
   return (
     <Layout>
       <Header

From f6054ed96571c7033a66a7fbe1425cc64e3e463c Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 14 Sep 2022 12:50:42 -0300
Subject: [PATCH 029/132] added close curly brace

---
 source/locales/en/translation.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/locales/en/translation.json b/source/locales/en/translation.json
index 016d9642..5cc6d360 100644
--- a/source/locales/en/translation.json
+++ b/source/locales/en/translation.json
@@ -346,6 +346,7 @@
     "searchResults": "Search results",
     "selectStandard": "Select the NFT interface standard",
     "importTitle": "wants to add a NFT to your wallet"
+  },
   "removeToken": {
     "action": "Delete Token",
     "mainText": "Are you sure you want to delete ",

From 22887aab5607c0a372170da7a7593356f92f0900 Mon Sep 17 00:00:00 2001
From: Cancu <52618089+Cancuuu@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:43:01 -0300
Subject: [PATCH 030/132] Update
 source/views/Extension/Views/AddNFT/hooks/useSteps.jsx

Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
---
 source/views/Extension/Views/AddNFT/hooks/useSteps.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/views/Extension/Views/AddNFT/hooks/useSteps.jsx b/source/views/Extension/Views/AddNFT/hooks/useSteps.jsx
index 5f8ca987..823fd72b 100644
--- a/source/views/Extension/Views/AddNFT/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/AddNFT/hooks/useSteps.jsx
@@ -22,7 +22,7 @@ const useSteps = () => {
   const handleClose = () => navigator.navigate('home');
 
   const leftButton = (onClick) => <LinkButton value={t('common.back')} onClick={onClick} startIcon={BackIcon} />;
-  const rightButton = <LinkButton value={t('common.close')} onClick={() => handleClose()} />;
+  const rightButton = <LinkButton value={t('common.close')} onClick={handleClose} />;
 
   const steps = [
     {

From 3d3278e7d06852a5f9092eabc6dd497bbf9b4e83 Mon Sep 17 00:00:00 2001
From: Cancu <52618089+Cancuuu@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:43:09 -0300
Subject: [PATCH 031/132] Update
 source/views/Extension/Views/AddNFT/Steps/Step2.jsx

Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
---
 source/views/Extension/Views/AddNFT/Steps/Step2.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
index 696be489..cd0604f2 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -46,7 +46,6 @@ const Step2 = ({ selectedToken, handleClose }) => {
         }
       );
     });
-    console.log('salio todo correcto')
   };
 
   return (

From d788c115eb36cea929ebff428dcda0534574dcbb Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 19 Sep 2022 12:48:46 -0300
Subject: [PATCH 032/132] it work calling sendMessage in AppConnection

---
 source/views/Popup/components/AppConnection/index.jsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/views/Popup/components/AppConnection/index.jsx b/source/views/Popup/components/AppConnection/index.jsx
index e4b4f582..36ed8610 100644
--- a/source/views/Popup/components/AppConnection/index.jsx
+++ b/source/views/Popup/components/AppConnection/index.jsx
@@ -18,6 +18,7 @@ import extension from 'extensionizer';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { reviewPendingTransaction } from '@modules/storageManager';
 import { setAccountInfo } from '@redux/wallet';
+import { setICNSData } from '@redux/icns';
 
 import initConfig from '../../../../locales';
 import SIZES from '../Transfer/constants';
@@ -43,6 +44,12 @@ const AppConnection = ({ setOnTimeout, transactionId, metadata }) => {
 
   const { query } = qs.parseUrl(window.location.href);
 
+  // this needs to be temporal, we should check why wallet info cant access to icns global state -->
+  useEffect(() => {
+    sendMessage({ type: HANDLER_TYPES.GET_ICNS_DATA, params: { refresh: true } },
+      (icnsData) => { dispatch(setICNSData(icnsData)); });
+  }, []);
+
   const {
     url,
     icon,

From fe8db07c5e4418486ac810a1f91b26d219be2519 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 19 Sep 2022 18:08:45 -0300
Subject: [PATCH 033/132] fixed length problem

---
 .../ConnectionStatus/components/NetworkSelector/styles.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/components/ConnectionStatus/components/NetworkSelector/styles.js b/source/components/ConnectionStatus/components/NetworkSelector/styles.js
index 8080ccb0..3dddb7ef 100644
--- a/source/components/ConnectionStatus/components/NetworkSelector/styles.js
+++ b/source/components/ConnectionStatus/components/NetworkSelector/styles.js
@@ -4,7 +4,7 @@ import SHADOW_1 from '@shared/styles/shadows';
 export default makeStyles(() => ({
   background: {
     width: '100%',
-    height: 595,
+    height: '100vh',
     zIndex: 5,
     position: 'absolute',
     top: 0,

From 7d1dd4323dc49f06dd85d1b4fd7e91323be6b910 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Tue, 20 Sep 2022 12:26:03 -0500
Subject: [PATCH 034/132] Migrated walletId to uuid

---
 source/Background/Keyring/index.js            | 14 ++---
 source/Modules/storageManager.js              | 22 +++++--
 .../components/ConnectionControls/index.jsx   |  4 +-
 .../Profile/components/AccountItem/index.jsx  |  2 +-
 source/components/Profile/index.jsx           | 16 ++---
 source/components/WalletInfo/index.jsx        |  4 +-
 source/hooks/useApps.jsx                      |  8 +--
 source/redux/wallet.js                        | 11 +++-
 .../Views/ExportIdentity/steps/Step2.jsx      | 10 ++--
 source/views/Extension/Views/Home/index.jsx   | 31 +++++++---
 .../Extension/Views/WalletDetails/index.jsx   | 58 ++++++++++---------
 11 files changed, 109 insertions(+), 71 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 82f63e56..050754fa 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -180,8 +180,8 @@ export const getKeyringHandler = (type, keyring) => ({
   },
   [HANDLER_TYPES.CREATE_PRINCIPAL]: async (params) => keyring.createPrincipal(params),
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]:
-    async (walletNumber) => {
-      await keyring.setCurrentPrincipal(walletNumber);
+    async (walletId) => {
+      await keyring.setCurrentPrincipal(walletId);
       const state = await keyring.getState();
       extension.tabs.query({ active: true }, (tabs) => {
         extension.tabs.sendMessage(tabs[0].id, { action: 'updateConnection' });
@@ -224,9 +224,9 @@ export const getKeyringHandler = (type, keyring) => ({
       return { error: e.message };
     }
   },
-  [HANDLER_TYPES.GET_BALANCE]: async (subaccount) => {
+  [HANDLER_TYPES.GET_BALANCE]: async (walletId) => {
     try {
-      const assets = await keyring.getBalances({ subaccount });
+      const assets = await keyring.getBalances({ subaccount: walletId });
       const parsedAssets = parseAssetsAmount(assets);
       const icpPrice = await getICPPrice();
       return formatAssets(parsedAssets, icpPrice);
@@ -260,8 +260,8 @@ export const getKeyringHandler = (type, keyring) => ({
     }
   },
   [HANDLER_TYPES.EDIT_PRINCIPAL]:
-    async ({ walletNumber, name, emoji }) => (
-      keyring.editPrincipal(walletNumber, { name, emoji })
+    async ({ walletId, name, emoji }) => (
+      keyring.editPrincipal(walletId, { name, emoji })
     ),
   [HANDLER_TYPES.GET_PUBLIC_KEY]:
     async () => keyring.getPublicKey(),
@@ -295,7 +295,7 @@ export const getKeyringHandler = (type, keyring) => ({
       }
     },
   [HANDLER_TYPES.GET_PEM_FILE]:
-    async (walletNumber) => keyring.getPemFile(walletNumber),
+    async (walletId) => keyring.getPemFile(walletId),
   [HANDLER_TYPES.BURN_XTC]:
     async ({ to, amount }) => {
       try {
diff --git a/source/Modules/storageManager.js b/source/Modules/storageManager.js
index cf95730b..1f5a5cf1 100644
--- a/source/Modules/storageManager.js
+++ b/source/Modules/storageManager.js
@@ -27,7 +27,7 @@ export const getApps = (currentWalletId, cb) => {
   const defaultValue = {};
 
   secureGetWrapper(currentWalletId, defaultValue, (state) => (
-    cb(state?.[parseInt(currentWalletId, 10)]?.apps || defaultValue)
+    cb(state?.[currentWalletId]?.apps || defaultValue)
   ));
 };
 
@@ -35,7 +35,7 @@ export const getApp = (currentWalletId, appUrl, cb) => {
   const defaultValue = {};
 
   secureGetWrapper(currentWalletId, defaultValue, (state) => {
-    cb(state?.[parseInt(currentWalletId, 10)]?.apps?.[appUrl] || defaultValue);
+    cb(state?.[currentWalletId]?.apps?.[appUrl] || defaultValue);
   });
 };
 
@@ -123,7 +123,7 @@ export const setUseICNS = (useICNS, walletNumber, cb = () => {}) => {
   const defaultValue = true;
 
   secureGetWrapper('icns', defaultValue, (state) => {
-    cb(state?.icns?.[parseInt(walletNumber, 10)] ?? defaultValue);
+    cb(state?.icns?.[walletNumber] ?? defaultValue);
     secureSetWrapper({
       icns: {
         ...state?.icns,
@@ -136,7 +136,7 @@ export const setUseICNS = (useICNS, walletNumber, cb = () => {}) => {
 export const getUseICNS = (walletNumber, cb) => {
   const defaultValue = true;
   secureGetWrapper('icns', defaultValue, (state) => {
-    cb(state?.icns?.[parseInt(walletNumber, 10)] ?? defaultValue);
+    cb(state?.icns?.[walletNumber] ?? defaultValue);
   });
 };
 
@@ -154,6 +154,11 @@ export const getBatchTransactions = (cb) => {
 
 export const getWalletsConnectedToUrl = (url, walletIds, cb) => {
   const wallets = [];
+  if (!walletIds.length) {
+    cb([]);
+    return;
+  }
+
   walletIds.forEach((id) => {
     getApp(id.toString(), url, (app = {}) => {
       if (app?.status === CONNECTION_STATUS.accepted) {
@@ -202,3 +207,12 @@ export const removePendingTransaction = (transactionId, cb) => {
 export const resetPendingTransactions = () => {
   secureSetWrapper({ activeTransactions: { } }, {}, () => {});
 };
+
+export const updateWalletId = (previousWalletId, newWalletId) => {
+  getApps(previousWalletId, (apps) => {
+    setApps(newWalletId, apps);
+  });
+  getUseICNS(previousWalletId, (result) => {
+    setUseICNS(newWalletId, result);
+  });
+};
diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index f045a0f8..88b0eb93 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -33,7 +33,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   const { tabIndex } = disableNavigation ? {} : useRouter();
   const {
     principalId,
-    walletNumber,
+    walletId,
     assetsLoading,
     transactionsLoading,
     collectionsLoading,
@@ -61,7 +61,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   extensionizer.tabs.query({ active: true }, (tabs) => {
     const url = getTabURL(tabs?.[0]);
     // Check if new wallet is connected to the current page
-    getApps(walletNumber.toString(), (apps) => {
+    getApps(walletId, (apps) => {
       const isSiteConnected = !!apps?.[url];
       setConnected(isSiteConnected);
     });
diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 0f62a02d..ad952f06 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -56,7 +56,7 @@ const AccountItem = ({
       <div className={classes.rightContainer}>
         <IconButton
           disabled={isCurrentAccount || isHidden}
-          onClick={handleChangeAccount(account.walletNumber)}
+          onClick={handleChangeAccount(account.walletId)}
         >
           <img
             className={clsx((isCurrentAccount || isHidden) && classes.disabledIcon)}
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index cbeaab6f..a5d961ce 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -45,7 +45,7 @@ const Profile = ({ disableProfile }) => {
   const { navigator } = disableProfile ? {} : useRouter();
   const [isEditing, setIsEditing] = useState(false);
 
-  const { walletNumber, principalId } = useSelector((state) => state.wallet);
+  const { walletId, principalId } = useSelector((state) => state.wallet);
   const icpPrice = useICPPrice();
 
   const [open, setOpen] = useState(false);
@@ -70,8 +70,9 @@ const Profile = ({ disableProfile }) => {
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
-          setAccounts(state.wallets);
+        const walletsArray = Object.values(state?.wallets);
+        if (walletsArray?.length) {
+          setAccounts(walletsArray);
         }
       });
   }, []);
@@ -115,7 +116,8 @@ const Profile = ({ disableProfile }) => {
     dispatch(setCollections({ collections: [], principalId }));
     sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: wallet },
       (state) => {
-        if (state?.wallets?.length) {
+        const walletsArray = Object.values(state?.wallets);
+        if (walletsArray.length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
           getContacts();
@@ -151,11 +153,11 @@ const Profile = ({ disableProfile }) => {
       setTab(tabs?.[0]);
       // Check if new wallet is connected to the current page
       getWalletsConnectedToUrl(url, ids, async (wallets = []) => {
-        const currentConnected = wallets.includes(walletNumber);
+        const currentConnected = wallets.includes(walletId);
         const newConnected = wallets.includes(wallet);
 
         setConnectedWallets(wallets);
-        getApp(walletNumber.toString(), url, (currentApp) => {
+        getApp(walletId, url, (currentApp) => {
           setApp(currentApp);
           // If current was connected but new one isnt, prompt modal
           if (currentConnected && !newConnected) {
@@ -263,7 +265,7 @@ const Profile = ({ disableProfile }) => {
               <MenuList className={clsx(classes.accountContainer, classes.menu)}>
                 {
                   accounts.map((account) => {
-                    const isCurrentAccount = account.walletNumber === walletNumber;
+                    const isCurrentAccount = account.walletId === walletId;
 
                     return (
                       <AccountItem
diff --git a/source/components/WalletInfo/index.jsx b/source/components/WalletInfo/index.jsx
index 99f5d2bf..c26bc9e5 100644
--- a/source/components/WalletInfo/index.jsx
+++ b/source/components/WalletInfo/index.jsx
@@ -10,7 +10,7 @@ const WalletInfo = () => {
   const classes = useStyles();
   const [copied, setCopied] = useState(false);
 
-  const { name, principalId, walletNumber } = useSelector((state) => state.wallet);
+  const { name, principalId, walletId } = useSelector((state) => state.wallet);
   const { resolved, useICNS } = useSelector((state) => state.icns);
   const { t } = useTranslation();
   const copyText = t('copy.copyText');
@@ -22,7 +22,7 @@ const WalletInfo = () => {
 
   useEffect(() => {
     setRenderedName(useICNS ? resolved ?? name : name);
-  }, [resolved, name, walletNumber, useICNS]);
+  }, [resolved, name, walletId, useICNS]);
 
   const handleWalletClick = () => {
     navigator.clipboard.writeText(principalId);
diff --git a/source/hooks/useApps.jsx b/source/hooks/useApps.jsx
index f43c1cc0..59245f6f 100644
--- a/source/hooks/useApps.jsx
+++ b/source/hooks/useApps.jsx
@@ -8,7 +8,7 @@ const useApps = () => {
   const [apps, setApps] = useState({});
   const [parsedApps, setParsedApps] = useState([]);
   const [historicApps, setHistoricApps] = useState([]);
-  const { walletNumber } = useSelector((state) => state.wallet);
+  const { walletId } = useSelector((state) => state.wallet);
 
   const handleRemoveApp = (appUrl) => {
     const newApps = addDisconnectedEntry({ apps, appUrl });
@@ -16,15 +16,15 @@ const useApps = () => {
   };
 
   useEffect(() => {
-    getApps(walletNumber?.toString(), (appsFromExtensionStorage = {}) => {
+    getApps(walletId, (appsFromExtensionStorage = {}) => {
       if (appsFromExtensionStorage) {
         setApps(appsFromExtensionStorage);
       }
     });
-  }, [walletNumber]);
+  }, [walletId]);
 
   useEffect(() => {
-    setStorageApps(walletNumber, apps);
+    setStorageApps(walletId, apps);
     const parsed = Object.values(apps) || [];
 
     const allEvents = parsed?.flatMap((app) => app?.events?.map((event) => ({
diff --git a/source/redux/wallet.js b/source/redux/wallet.js
index 85ae4180..1c74541d 100644
--- a/source/redux/wallet.js
+++ b/source/redux/wallet.js
@@ -25,11 +25,12 @@ export const walletSlice = createSlice({
     emoji: '👽',
     transactions: [],
     assets: Object.values(TOKENS),
-    walletNumber: 0,
+    walletId: '',
     assetsLoading: true,
     collections: [],
     collectionsLoading: false,
     transactionsLoading: false,
+    migratedWalletId: false,
   },
   reducers: {
     updateWalletDetails: (state, action) => {
@@ -41,13 +42,13 @@ export const walletSlice = createSlice({
       if (!action.payload) return;
       // Chrome serializes everything with toJSON
       const {
-        accountId, icon, name, principal, walletNumber,
+        accountId, icon, name, principal, walletId,
       } = action.payload;
       state.accountId = accountId;
       state.emoji = icon;
       state.name = name;
       state.principalId = principal;
-      state.walletNumber = walletNumber;
+      state.walletId = walletId;
     },
     setTransactions: (state, action) => {
       const { transactions, useICNS, icpPrice } = action.payload || {};
@@ -119,6 +120,9 @@ export const walletSlice = createSlice({
     blockNFTFetch: (state) => {
       state.optimisticNFTUpdate = true;
     },
+    setMigratedWalletId: (state, action) => {
+      state.migratedWalletId = action.payload;
+    },
   },
 });
 
@@ -132,6 +136,7 @@ export const {
   setCollections,
   setCollectionsLoading,
   blockNFTFetch,
+  setMigratedWalletId,
 } = walletSlice.actions;
 
 export default walletSlice.reducer;
diff --git a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
index e38b57fe..8b8cd856 100644
--- a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
+++ b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
@@ -14,18 +14,18 @@ import { useSelector } from 'react-redux';
 const Step2 = () => {
   const { t } = useTranslation();
   const [accounts, setAccounts] = useState([]);
-  const [selectedAccountNumber, setSelectedAccountNumber] = useState(null);
+  const [selectedAccountId, setSelectedAccountId] = useState(null);
   const [openAccounts, setOpenAccounts] = useState(false);
 
   const { name } = useSelector((state) => state.wallet);
 
   const handleCloseAccounts = (value) => {
     setOpenAccounts(false);
-    setSelectedAccountNumber(value.walletNumber);
+    setSelectedAccountId(value.walletNumber);
   };
 
   const handleDownloadPemFile = () => {
-    sendMessage({ type: HANDLER_TYPES.GET_PEM_FILE, params: selectedAccountNumber },
+    sendMessage({ type: HANDLER_TYPES.GET_PEM_FILE, params: selectedAccountId },
       (state) => {
         if (state) {
           download(`${name}.pem`, state);
@@ -38,12 +38,12 @@ const Step2 = () => {
       (state) => {
         if (state?.wallets?.length) {
           setAccounts(state.wallets);
-          setSelectedAccountNumber(state.currentWalletId);
+          setSelectedAccountId(state.currentWalletId);
         }
       });
   }, []);
 
-  const selectedAccount = accounts[selectedAccountNumber];
+  const selectedAccount = accounts[selectedAccountId];
 
   return (
     <Container>
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index feecffd2..6b7b66a3 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -17,16 +17,22 @@ import { setAccountInfo } from '@redux/wallet';
 import { useICPPrice } from '@redux/icp';
 import { setUseICNS } from '@redux/icns';
 import { isClockInSync } from '@shared/utils/time';
-import { getApp, getUseICNS, getWalletsConnectedToUrl } from '@modules/storageManager';
 import { getTabURL } from '@shared/utils/chrome-tabs';
 import extension from 'extensionizer';
+import {
+  getApp,
+  getUseICNS,
+  getWalletsConnectedToUrl,
+  updateWalletId,
+  getWalletIds,
+} from '@modules/storageManager';
 
 const Home = () => {
   const { t } = useTranslation();
   const dispatch = useDispatch();
   const { navigator, tabIndex } = useRouter();
   const {
-    assetsLoading, collectionsLoading, transactionsLoading, walletNumber,
+    assetsLoading, collectionsLoading, transactionsLoading, walletId, migratedWalletId,
   } = useSelector((state) => state.wallet);
   const { usingMainnet } = useSelector((state) => state.network);
 
@@ -79,7 +85,7 @@ const Home = () => {
       getWalletsConnectedToUrl(url, ids, (_connectedWallets = []) => {
         setConnectedWallets(_connectedWallets);
         if (_connectedWallets.length > 0) {
-          getApp(walletNumber.toString(), url, (currentApp) => {
+          getApp(walletId, url, (currentApp) => {
             setApp(currentApp);
             const isConnected = _connectedWallets.includes(state.currentWalletId);
             if (!isConnected) {
@@ -92,7 +98,7 @@ const Home = () => {
   };
 
   const updateProviderConnection = async () => {
-    const currentWallet = wallets?.[walletNumber] || null;
+    const currentWallet = wallets?.[walletId] || null;
     if (currentWallet) {
       extension.tabs.query({ active: true }, (activeTabs) => {
         extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
@@ -102,22 +108,29 @@ const Home = () => {
 
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (!state?.wallets?.length) {
+      if (!Object.keys(state?.wallets).length) {
         sendMessage({ type: HANDLER_TYPES.LOCK, params: {} }, () => navigator.navigate('login'));
       } else if (!clockValidated) {
         isClockInSync().then((isInSync) => !isInSync && navigator.navigate('clockError'));
+        validateProviderConnection(state);
+      } else if (!migratedWalletId) {
+        state.wallets.forEach((wallet) => {
+          updateWalletId(wallet.walletNumber, wallet.walletId);
+        }); 
       }
-      setWallets(state?.wallets);
+
+      setWallets(Object.values(state?.wallets));
       dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       validateProviderConnection(state);
     });
-  }, [clockValidated]);
+  }, [clockValidated, migratedWalletId]);
 
   useEffect(() => {
-    getUseICNS(walletNumber, (useICNS) => {
+    getUseICNS(walletId, (useICNS) => {
       dispatch(setUseICNS(useICNS));
     });
-  }, [walletNumber]);
+  }, [walletId]);
+
   return (
     <Layout>
       <Actions visible={tabIndex === 0} />
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index b7616d19..1fbb2547 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -55,16 +55,16 @@ const WalletDetails = () => {
   const icpPrice = useICPPrice();
 
   const { editAccount } = useSelector((state) => state.profile);
-  const { walletNumber: activeWalletNumber } = useSelector((state => state.wallet));
+  const { walletId: activeWalletId } = useSelector((state => state.wallet));
 
   const textInput = useRef(null);
-  const { name, icon: emoji, accountId, principal: principalId, walletNumber } = editAccount;
+  const { name, icon: emoji, accountId, principal: principalId, walletId } = editAccount;
 
   const [openConnectAccount, setOpenConnectAccount] = useState(false);
   const [connectedWallets, setConnectedWallets] = useState([]);
   const [tab, setTab] = useState(null);
   const [app, setApp] = useState(null);
-  const [accountSwitchId, setAccountSwitchId] = useState(walletNumber);
+  const [accountSwitchId, setAccountSwitchId] = useState(walletId);
   const [accounts, setAccounts] = useState([]);
   const [openEmojis, setOpenEmojis] = useState(false);
   const [walletName, setWalletName] = useState(name);
@@ -85,19 +85,19 @@ const WalletDetails = () => {
   useEffect(() => {
     setICNSLoading(true);
     // Use standard ICNS data
-    if (walletNumber === activeWalletNumber) {
+    if (walletId === activeWalletId) {
       setICNSLoading(false);
       setUseICNS(reduxUseICNS);
       setResolved(reduxResolved);
       setICNSNames(reduxNames);
     } else {
-      getUseICNS(walletNumber, (storageUseICNS) => {
+      getUseICNS(walletId, (storageUseICNS) => {
         setUseICNS(storageUseICNS);
       });
 
       sendMessage({
         type: HANDLER_TYPES.GET_ICNS_DATA,
-        params: { refresh: true, walletId: walletNumber },
+        params: { refresh: true, walletId },
       }, (icnsData) => {
         const { names, reverseResolvedName } = icnsData;
         setICNSNames(names || []);
@@ -105,7 +105,7 @@ const WalletDetails = () => {
         setICNSLoading(false);
       });
     }
-  }, [walletNumber]);
+  }, [walletId]);
 
   const handleChange = (e) => setWalletName(e.target.value);
 
@@ -132,13 +132,13 @@ const WalletDetails = () => {
         {
           type: HANDLER_TYPES.EDIT_PRINCIPAL,
           params: {
-            walletNumber,
+            walletId,
             name: walletName,
             emoji: currentEmoji,
           },
         },
         () => {
-          if (activeWalletNumber === walletNumber) {
+          if (activeWalletId === walletId) {
             dispatch(updateWalletDetails({
               name: walletName,
               emoji: currentEmoji,
@@ -155,15 +155,15 @@ const WalletDetails = () => {
     const { checked } = event.target;
 
     setUseICNS(checked);
-    setStorageUseICNS(checked, walletNumber);
-    if (walletNumber === activeWalletNumber) {
+    setStorageUseICNS(checked, walletId);
+    if (walletId === activeWalletId) {
       dispatch(setReduxUseICNS(checked));
     }
 
     if (!checked) {
       sendMessage({
         type: HANDLER_TYPES.SET_REVERSE_RESOLVED_NAME,
-        params: { name: '', walletId: walletNumber },
+        params: { name: '', walletId: walletId },
       }, (response) => {
         if (response.error) {
           // eslint-disable-next-line
@@ -171,9 +171,9 @@ const WalletDetails = () => {
         } else {
           sendMessage({
             type: HANDLER_TYPES.GET_ICNS_DATA,
-            params: { refresh: true, walletId: walletNumber },
+            params: { refresh: true, walletId },
           }, (icnsData) => {
-            if (walletNumber === activeWalletNumber) {
+            if (walletId === activeWalletId) {
               dispatch(setICNSData(icnsData));
             }
 
@@ -190,7 +190,7 @@ const WalletDetails = () => {
   const handleSetReverseResolution = (name, resetModal) => {
     sendMessage({
       type: HANDLER_TYPES.SET_REVERSE_RESOLVED_NAME,
-      params: { name, walletId: walletNumber },
+      params: { name, walletId },
     }, (response) => {
       if (response.error) {
         // eslint-disable-next-line
@@ -198,9 +198,9 @@ const WalletDetails = () => {
       } else {
         sendMessage({
           type: HANDLER_TYPES.GET_ICNS_DATA,
-          params: { refresh: true, walletId: walletNumber },
+          params: { refresh: true, walletId },
         }, (icnsData) => {
-          if (walletNumber === activeWalletNumber) {
+          if (walletId === activeWalletId) {
             dispatch(setICNSData(icnsData));
           }
 
@@ -220,21 +220,26 @@ const WalletDetails = () => {
       const ids = accounts.map((_, idx) => idx);
       setTab(tabs?.[0]);
       // Check if new wallet is connected to the current page
-      setAccountSwitchId(walletNumber);
+      setAccountSwitchId(walletId);
+
+      if (!ids.length) {
+        executeAccountSwitch(walletId);
+        return;
+      }
 
       getWalletsConnectedToUrl(url, ids, async (wallets = []) => {
-        const currentConnected = wallets.includes(activeWalletNumber);
-        const newConnected = wallets.includes(walletNumber);
+        const currentConnected = wallets.includes(activeWalletId);
+        const newConnected = wallets.includes(walletId);
 
         setConnectedWallets(wallets);
 
-        getApp(activeWalletNumber.toString(), url, (currentApp) => {
+        getApp(activeWalletId.toString(), url, (currentApp) => {
           setApp(currentApp);
           // If current was connected but new one isnt, prompt modal
           if (currentConnected && !newConnected) {
             setOpenConnectAccount(true);
           } else {
-            executeAccountSwitch(walletNumber);
+            executeAccountSwitch(walletId);
           }
         });
       });
@@ -245,7 +250,7 @@ const WalletDetails = () => {
     dispatch(setCollections({ collections: [], principalId }));
     sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: accountSwitchId },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.values(state?.wallets).length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
           getContacts();
@@ -271,7 +276,7 @@ const WalletDetails = () => {
   };
 
   const handleDeclineConnect = () => {
-    executeAccountSwitch(activeWalletNumber);
+    executeAccountSwitch(activeWalletId);
     setOpenConnectAccount(false);
   };
 
@@ -312,7 +317,7 @@ const WalletDetails = () => {
       <ConnectAccountsModal
         open={openConnectAccount}
         onClose={handleDeclineConnect}
-        onConfirm={() => executeAccountSwitch(walletNumber)}
+        onConfirm={() => executeAccountSwitch(walletId)}
         wallets={accounts}
         connectedWallets={connectedWallets}
         app={app}
@@ -355,7 +360,7 @@ const WalletDetails = () => {
             )
             : (
               <div className={classes.buttonsContainer}>
-                { walletNumber !== activeWalletNumber && (
+                { walletId !== activeWalletId && (
                   <button
                     type="button"
                     data-testid="edit-icon-button"
@@ -402,7 +407,6 @@ const WalletDetails = () => {
           names={icnsNames}
           resolved={resolved}
           handleToggle={handleToggleICNS}
-          walletNumber={walletNumber}
           loading={icnsLoading}
           handleSetReverseResolution={handleSetReverseResolution}
         />

From e71a6ee9361f43eb9d0485fbc5670c5f499cc96b Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Tue, 20 Sep 2022 18:14:16 -0300
Subject: [PATCH 035/132] added import wallet route - and menu item in profile

---
 source/components/Profile/index.jsx                | 13 +++++++++++++
 source/locales/en/translation.json                 |  1 +
 source/views/Extension/Popup.jsx                   |  2 ++
 .../Views/ImportWallet/hooks/useSteps.jsx          |  0
 .../views/Extension/Views/ImportWallet/index.jsx   | 14 ++++++++++++++
 5 files changed, 30 insertions(+)
 create mode 100644 source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
 create mode 100644 source/views/Extension/Views/ImportWallet/index.jsx

diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index cbeaab6f..205598eb 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -179,6 +179,10 @@ const Profile = ({ disableProfile }) => {
     setSelectedWallet(null);
   };
 
+  const handleOpenImportWallet = () => {
+    navigator.navigate('import-wallet');
+  };
+
   return (
     <>
       <HoverAnimation
@@ -288,6 +292,15 @@ const Profile = ({ disableProfile }) => {
                   onClick={handleOpenCreateAccount}
                   data-testid="create-account-button"
                 />
+                <MenuItem
+                  size="small"
+                  key="createAccount"
+                  name={t('profile.importWallet')}
+                  alignLeft
+                  logo={Plus}
+                  onClick={handleOpenImportWallet}
+                  data-testid="create-account-button"
+                />
                 <Divider style={{ margin: '6px 0' }} />
                 {
                   menuItems.map((item) => (
diff --git a/source/locales/en/translation.json b/source/locales/en/translation.json
index 5cc6d360..f5a5ad9f 100644
--- a/source/locales/en/translation.json
+++ b/source/locales/en/translation.json
@@ -24,6 +24,7 @@
   "profile": {
     "myAccounts": "My Accounts",
     "createAccount": "Create Account",
+    "importWallet": "Import Wallet",
     "settings": "Settings",
     "subaccountNotConnected": "This account is not connected",
     "wantToConnect": "Do you want to connect your accounts?",
diff --git a/source/views/Extension/Popup.jsx b/source/views/Extension/Popup.jsx
index 1f3fc187..b35305d9 100644
--- a/source/views/Extension/Popup.jsx
+++ b/source/views/Extension/Popup.jsx
@@ -24,6 +24,7 @@ import SendNFT from './Views/SendNFT';
 import ClockError from './Views/ClockError';
 import Network from './Views/Network';
 import NetworkCreation from './Views/NetworkCreation';
+import ImportWallet from './Views/ImportWallet';
 
 const Popup = ({ initialRoute }) => (
   <Router initialRouteName={initialRoute}>
@@ -36,6 +37,7 @@ const Popup = ({ initialRoute }) => (
     <Route name="deposit" component={Deposit} />
     {/* <Route name="swap" component={Swap} /> */}
     <Route name="clockError" component={ClockError} />
+    <Route name="import-wallet" component={ImportWallet} />
     <Route name="send" component={Send} />
     <Route name="contacts" component={Contacts} />
     <Route name="error" component={ErrorScreen} />
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
new file mode 100644
index 00000000..e69de29b
diff --git a/source/views/Extension/Views/ImportWallet/index.jsx b/source/views/Extension/Views/ImportWallet/index.jsx
new file mode 100644
index 00000000..b9fde684
--- /dev/null
+++ b/source/views/Extension/Views/ImportWallet/index.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Layout } from '@components';
+
+const ImportWallet = () => {
+  return (
+    <Layout>
+        <h2>
+          Import Wallet
+        </h2>
+    </Layout>
+  );
+};
+
+export default ImportWallet;

From 7663a093ac3456ef626fb188a728ed690b548abf Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Tue, 20 Sep 2022 19:12:43 -0300
Subject: [PATCH 036/132] added dotted div for drag and drop

---
 .../Views/ImportWallet/Steps/Step1.jsx        | 42 +++++++++++++++++++
 .../Views/ImportWallet/hooks/useSteps.jsx     | 40 ++++++++++++++++++
 .../Extension/Views/ImportWallet/index.jsx    | 15 +++++--
 .../Extension/Views/ImportWallet/styles.js    | 25 +++++++++++
 4 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
 create mode 100644 source/views/Extension/Views/ImportWallet/styles.js

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
new file mode 100644
index 00000000..027342e5
--- /dev/null
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -0,0 +1,42 @@
+import { Container, Button } from '@components'
+import { Typography } from '@material-ui/core';
+import Grid from '@material-ui/core/Grid';
+import React, { useState } from 'react'
+import useStyles from '../styles';
+import { CloudUpload } from '@material-ui/icons';
+
+const Step1 = () => {
+
+  const [loading, setLoading] = useState(false);
+
+  const classes = useStyles();
+
+  return (
+    <Container>
+      <Grid container spacing={2}>
+        <Grid item xs={12}>
+          <div className={classes.dragDropContainer}>
+            <CloudUpload fontSize='large' styles={{backgroundColor: '#BBBEC2'}} />
+            <Typography className={classes.dragDropText} variant='h6'>
+              Drag and Drop <br />
+              or <a className={classes.dragDropBrowse} href="">browse</a>
+            </Typography>
+          </div>
+        </Grid>
+        <Grid item xs={12}>
+          <Button
+            variant="rainbow"
+            value="Continue"
+            onClick={() => console.log('Hola como estas')}
+            loading={loading}
+            disabled={loading}
+            fullWidth
+            data-testid="add-button"
+          />
+        </Grid>
+      </Grid>
+    </Container>
+  )
+}
+
+export default Step1
\ No newline at end of file
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index e69de29b..452804ab 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -0,0 +1,40 @@
+import React, { useState } from 'react';
+import { LinkButton } from '@components';
+import { useTranslation } from 'react-i18next';
+import { useRouter } from '@components/Router';
+import BackIcon from '@assets/icons/back.svg';
+import Step1 from '../Steps/Step1';
+
+
+const useSteps = () => {
+  const [step, setStep] = useState(0);
+  const { navigator } = useRouter();
+  const { t } = useTranslation();
+
+  const handleChangeStep = (index) => setStep(index);
+  const handleClose = () => navigator.navigate('home');
+
+  const leftButton = (onClick) => <LinkButton value={t('common.back')} onClick={onClick} startIcon={BackIcon} />;
+  const rightButton = <LinkButton value={t('common.close')} onClick={handleClose} />;
+
+  const steps = [
+    {
+      component: <Step1 />,
+      left: leftButton(() => handleClose()),
+      right: rightButton,
+      center: 'Import PEM file',
+    },
+    // {
+    //   component: <Step2
+    //     handleClose={handleClose}
+    //   />,
+    //   left: leftButton(() => handleChangeStep(0)),
+    //   right: rightButton,
+    //   center: 'Import PEM file',
+    // },
+  ];
+
+  return steps[step];
+};
+
+export default useSteps;
diff --git a/source/views/Extension/Views/ImportWallet/index.jsx b/source/views/Extension/Views/ImportWallet/index.jsx
index b9fde684..18be5bc5 100644
--- a/source/views/Extension/Views/ImportWallet/index.jsx
+++ b/source/views/Extension/Views/ImportWallet/index.jsx
@@ -1,12 +1,19 @@
 import React from 'react';
-import { Layout } from '@components';
+import { Layout, Header } from '@components';
+import useSteps from './hooks/useSteps';
 
 const ImportWallet = () => {
+  const {
+    component,
+    left,
+    right,
+    center,
+  } = useSteps();
+
   return (
     <Layout>
-        <h2>
-          Import Wallet
-        </h2>
+      <Header left={left} center={center} right={right} />
+      {component}
     </Layout>
   );
 };
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
new file mode 100644
index 00000000..9e315ed5
--- /dev/null
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -0,0 +1,25 @@
+import { makeStyles } from '@material-ui/core/styles';
+
+export default makeStyles((theme) => ({
+  dragDropContainer: {
+    border: '2px dashed #D1D5DB',
+    boxShadow: '0px 1px 2px rgba(0, 0, 0, 0.05)',
+    height: '142px',
+    width: '370px',
+    borderRadius: 6,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'column',
+  },
+  dragDropIcon: {
+    color: '#BBBEC2',
+  },
+  dragDropText: {
+    color: '#D1D5DB',
+    textAlign: 'center'
+  },
+  dragDropBrowse: {
+    color: '#111827',
+  }
+}));

From 5abcbf466bed5b4ed40b53b2529207b5c66e9174 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Tue, 20 Sep 2022 20:51:48 -0300
Subject: [PATCH 037/132] added logic to drag and drop form

---
 .../Views/ImportWallet/Steps/Step1.jsx        | 84 ++++++++++++++++---
 .../Extension/Views/ImportWallet/styles.js    | 26 +++++-
 2 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 027342e5..91247188 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -1,27 +1,91 @@
 import { Container, Button } from '@components'
 import { Typography } from '@material-ui/core';
 import Grid from '@material-ui/core/Grid';
-import React, { useState } from 'react'
+import React, { useRef, useState } from 'react'
 import useStyles from '../styles';
 import { CloudUpload } from '@material-ui/icons';
+import Plug from "../../../../../components/Plug";
 
 const Step1 = () => {
-
   const [loading, setLoading] = useState(false);
+  const [dragActive, setDragActive] = useState(false);
+  const [isPEMFile, setIsPEMFile] = useState(false);
+
+  const ACCEPTED_FILE_EXT = 'pem';
 
   const classes = useStyles();
 
+  const inputRef = useRef(null);
+
+  const checkPemFile = (fileObject) => {
+    const fileExt = fileObject[0]?.name.split('.').pop();
+    if (fileExt === ACCEPTED_FILE_EXT) {
+      console.log('extension correcta', fileExt);
+    } else {
+      console.log('extension incorrecta', fileExt);
+    }
+  }
+
+  const handleDrag = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (e.type === "dragenter" || e.type === "dragover") {
+      setDragActive(true);
+    } else if (e.type === "dragleave") {
+      setDragActive(false);
+    }
+  }
+
+  const handleDrop = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setDragActive(false);
+    if (e.dataTransfer.files && e.dataTransfer.files[0]) {
+      checkPemFile(e.dataTransfer.files);
+    }
+  };
+
+  const handleChange = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (e.target.files && e.target.files[0]) {
+      checkPemFile(e.target.files);
+    }
+  }
+ 
   return (
     <Container>
       <Grid container spacing={2}>
         <Grid item xs={12}>
-          <div className={classes.dragDropContainer}>
-            <CloudUpload fontSize='large' styles={{backgroundColor: '#BBBEC2'}} />
-            <Typography className={classes.dragDropText} variant='h6'>
-              Drag and Drop <br />
-              or <a className={classes.dragDropBrowse} href="">browse</a>
-            </Typography>
-          </div>
+          <form
+            onDragEnter={handleDrag} 
+            onDragLeave={handleDrag} 
+            onDragOver={handleDrag} 
+            onDrop={handleDrop} 
+            onSubmit={(e) => e.preventDefault()} 
+            className={classes.dragDropContainer}
+          >
+            <input type="file" ref={inputRef} id="input-file-upload" className={classes.inputDropContainer} multiple={false} onChange={(e) => handleChange(e)} />
+            <label className={classes.labelInputDropContainer} htmlFor="input-file-upload">
+              {
+                dragActive ? (
+                  <div className={classes.dropItContainer}>
+                    <Plug size="small" />
+                    <Typography variant='h3'>
+                    Drop it !
+                    </Typography>
+                  </div>
+                ) : (
+                  <>
+                    <CloudUpload fontSize='large' styles={{ backgroundColor: '#BBBEC2' }} /><Typography className={classes.dragDropText} variant='h6'>
+                      Drag and Drop <br />
+                      or <a className={classes.dragDropBrowse} href="">browse</a>
+                    </Typography>
+                  </>
+                )
+              }
+            </label>
+          </form>
         </Grid>
         <Grid item xs={12}>
           <Button
@@ -39,4 +103,4 @@ const Step1 = () => {
   )
 }
 
-export default Step1
\ No newline at end of file
+export default Step1
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 9e315ed5..b2d0f19c 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -7,10 +7,6 @@ export default makeStyles((theme) => ({
     height: '142px',
     width: '370px',
     borderRadius: 6,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'column',
   },
   dragDropIcon: {
     color: '#BBBEC2',
@@ -21,5 +17,27 @@ export default makeStyles((theme) => ({
   },
   dragDropBrowse: {
     color: '#111827',
+  },
+  inputDropContainer: {
+    display: 'none',
+  },
+  labelInputDropContainer: {
+    height: '100%',
+    width: '100%',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'column',
+  },
+  dropItContainer: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    gap: 10,
+  },
+  dragFileElement: {
+    position: 'absolute',
+    width: '100vw',
+    height: '100vh',
   }
 }));

From 60db3626c1f21edf120957fc9d272b9994b492d5 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 21 Sep 2022 01:07:04 -0300
Subject: [PATCH 038/132] shows file when upload

---
 source/assets/icons/gradient-file.svg         | 11 +++
 .../Views/ImportWallet/Steps/Step1.jsx        | 73 ++++++++++++-------
 .../Extension/Views/ImportWallet/styles.js    | 28 +++++++
 3 files changed, 87 insertions(+), 25 deletions(-)
 create mode 100644 source/assets/icons/gradient-file.svg

diff --git a/source/assets/icons/gradient-file.svg b/source/assets/icons/gradient-file.svg
new file mode 100644
index 00000000..97a14564
--- /dev/null
+++ b/source/assets/icons/gradient-file.svg
@@ -0,0 +1,11 @@
+<svg width="28" height="34" viewBox="0 0 28 34" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.33334 23.6667H20.6667V27H7.33334V23.6667ZM7.33334 17H20.6667V20.3334H7.33334V17ZM17.3333 0.333374H4.00001C2.16667 0.333374 0.666672 1.83337 0.666672 3.66671V30.3334C0.666672 32.1667 2.15 33.6667 3.98334 33.6667H24C25.8333 33.6667 27.3333 32.1667 27.3333 30.3334V10.3334L17.3333 0.333374ZM24 30.3334H4.00001V3.66671H15.6667V12H24V30.3334Z" fill="url(#paint0_linear_8125_2720)"/>
+<defs>
+<linearGradient id="paint0_linear_8125_2720" x1="-0.209237" y1="7.0641" x2="29.5996" y2="9.13142" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FFE701"/>
+<stop offset="0.34375" stop-color="#FA51D3"/>
+<stop offset="0.692708" stop-color="#10D9ED"/>
+<stop offset="1" stop-color="#52FF53"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 91247188..57acd82a 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -1,15 +1,18 @@
-import { Container, Button } from '@components'
+import { Container, Button, Alert } from '@components'
 import { Typography } from '@material-ui/core';
 import Grid from '@material-ui/core/Grid';
 import React, { useRef, useState } from 'react'
 import useStyles from '../styles';
 import { CloudUpload } from '@material-ui/icons';
-import Plug from "../../../../../components/Plug";
+import CloseIcon from '@material-ui/icons/Close';
+import { useEffect } from 'react';
+import GradientFile from '@assets/icons/gradient-file.svg';
 
 const Step1 = () => {
   const [loading, setLoading] = useState(false);
   const [dragActive, setDragActive] = useState(false);
-  const [isPEMFile, setIsPEMFile] = useState(false);
+  const [fileNotSupported, setFileNotSupported] = useState(false);
+  const [pemFile, setPemFile] = useState(null);
 
   const ACCEPTED_FILE_EXT = 'pem';
 
@@ -21,7 +24,10 @@ const Step1 = () => {
     const fileExt = fileObject[0]?.name.split('.').pop();
     if (fileExt === ACCEPTED_FILE_EXT) {
       console.log('extension correcta', fileExt);
+      console.log('file extension', fileObject[0]);
+      setPemFile(fileObject[0]);
     } else {
+      setFileNotSupported(true);
       console.log('extension incorrecta', fileExt);
     }
   }
@@ -52,40 +58,57 @@ const Step1 = () => {
       checkPemFile(e.target.files);
     }
   }
- 
+
+  useEffect(() => {
+    if (fileNotSupported) {
+      setTimeout(() => {
+        console.log('arranca setTimeOut');
+        setFileNotSupported(false);
+      }, 2000)
+    }
+  }, [fileNotSupported]);
+
   return (
     <Container>
       <Grid container spacing={2}>
         <Grid item xs={12}>
-          <form
-            onDragEnter={handleDrag} 
-            onDragLeave={handleDrag} 
-            onDragOver={handleDrag} 
-            onDrop={handleDrop} 
-            onSubmit={(e) => e.preventDefault()} 
-            className={classes.dragDropContainer}
-          >
-            <input type="file" ref={inputRef} id="input-file-upload" className={classes.inputDropContainer} multiple={false} onChange={(e) => handleChange(e)} />
-            <label className={classes.labelInputDropContainer} htmlFor="input-file-upload">
+          <div className={classes.dragDropContainer}>
+            <form
+              onDragEnter={handleDrag}
+              onDragLeave={handleDrag}
+              onDragOver={handleDrag}
+              onDrop={handleDrop}
+              onSubmit={(e) => e.preventDefault()}
+              className={classes.insideDragDrop}
+            >
               {
-                dragActive ? (
-                  <div className={classes.dropItContainer}>
-                    <Plug size="small" />
-                    <Typography variant='h3'>
-                    Drop it !
-                    </Typography>
-                  </div>
+                pemFile ? (
+                  <>
+                    <img src={GradientFile} alt="gradientFile" />
+                    <div className={classes.nameXIcon}>
+                      <Typography variant='h5'>
+                        {pemFile.name || ''}
+                      </Typography>
+                      <CloseIcon className={classes.icon} onClick={(e) => console.log(e)} />
+                    </div>
+                  </>
                 ) : (
                   <>
-                    <CloudUpload fontSize='large' styles={{ backgroundColor: '#BBBEC2' }} /><Typography className={classes.dragDropText} variant='h6'>
+                    <CloudUpload fontSize='large' />
+                    <Typography className={classes.dragDropText} variant='h6'>
                       Drag and Drop <br />
                       or <a className={classes.dragDropBrowse} href="">browse</a>
                     </Typography>
                   </>
                 )
               }
-            </label>
-          </form>
+            </form>
+          </div>
+          {
+            fileNotSupported && (
+              <Alert type="danger" title={"File not supported. Try a different file."} startIcon />
+            )
+          }
         </Grid>
         <Grid item xs={12}>
           <Button
@@ -93,7 +116,7 @@ const Step1 = () => {
             value="Continue"
             onClick={() => console.log('Hola como estas')}
             loading={loading}
-            disabled={loading}
+            disabled={!loading}
             fullWidth
             data-testid="add-button"
           />
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index b2d0f19c..e0b02aed 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -7,6 +7,29 @@ export default makeStyles((theme) => ({
     height: '142px',
     width: '370px',
     borderRadius: 6,
+    marginBottom: 10,
+  },
+  dragDropContainerError: {
+    border: '2px dashed #E53C3C',
+    boxShadow: '0px 1px 2px rgba(0, 0, 0, 0.05)',
+    height: '142px',
+    width: '370px',
+    borderRadius: 6,
+    marginBottom: 10,
+  },
+  insideDragDrop: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    flexDirection: 'column',
+    height: '100%',
+  },
+  nameXIcon: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginTop: 12,
+    gap: 4,
   },
   dragDropIcon: {
     color: '#BBBEC2',
@@ -15,6 +38,11 @@ export default makeStyles((theme) => ({
     color: '#D1D5DB',
     textAlign: 'center'
   },
+  icon: {
+    cursor: 'pointer',
+    color: '#11182766',
+    fontSize: 20,
+  },
   dragDropBrowse: {
     color: '#111827',
   },

From 9c3831b5b7060536b72076ecccdd050b8195369e Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 21 Sep 2022 13:55:39 -0300
Subject: [PATCH 039/132] added chain emoji

---
 source/assets/icons/link-emoji.png  | Bin 0 -> 29757 bytes
 source/components/Profile/index.jsx |   4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 source/assets/icons/link-emoji.png

diff --git a/source/assets/icons/link-emoji.png b/source/assets/icons/link-emoji.png
new file mode 100644
index 0000000000000000000000000000000000000000..64b16ffd859cce09e11968271418349928db7b34
GIT binary patch
literal 29757
zcmV*?KrO$CP)<h;3K|Lk000e1NJLTq005u>005u}1^@s6i_d2*00004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00007
zbV*G`2jL427YQbuWv}D_000JJOGiWi{{a60|De66lK=p7K}keGRCwC#op+ohXLYWh
z%2l1i^n{+Y6E-JBBqSsu2?U5JA%e&zW5C(IHuqkPu`iBbg9!#>V;nHSWRMU7Wt64O
zVRFtrokQiif7I+MflUxX((ci(CGAenO!Zf9o$s9Uo%6l|r|oHB-@4%zd8JU6o0cWW
zvP^p_=1Bq$5IkA0`KlK`Z<`RDzIRU<`~FS0M-%Z_{+@#)1E%Bmw55~1GfRc8TEk3=
zf*5O>mhO7KB#J^1(NtRysEd+N8|vv?EmiBYfosiQbk2@x({g8k%9G(U2{+vQqtkcx
zNouNu-mtvw<MXR$)f(2h(@X0+YAt)nwB4-j`kL+dNV1G5iU@*$C`yQe00ekJ009I+
zfa5qQvV<m!o~BCWs3uKzW@1O;5#|2Py}5hintB*${Yn7%z3<<2`c6NIES*lOQwwY7
zEEH;&kIXJ#vR*OIteH;64+K<IK~+^WRYjI%WJyMpBt#JeK?DQ@K_CDE0`LQZAi(nj
zJm16hJZ#Isaa|n8K?poznpDX|l?Mm&shhgm5;tZNvHJn<2?OAFZa59VCxgwe6?;u5
zxN>~H@Uq$E^0OMYA5%4*h^}K8I+~^;OA3-KBS{jXB!&MKB}7pKA@qU}dc7bB@PmNB
z5AXvY&-3s+58wCjJs;Qea2=PHX<?ccu5A)g{7Qd&{N}T_c7G`y)2@FawrSzI8-8&5
z?*9rcnNIJx>)`ln?m05^@=DX)CQ2%ac$7#af~ILGii)aesG5qRgfCf^5hWQ(dT9Fv
z5d;W=hXCmLKECIl^nRY_;(9Kg>*BgDuIu2sE}rM&*bdE>Nuypz@Jzar%AG@<vCr=q
z?D{fL{-pu%+t+>XGzxwNw%%}tD-Gu@KRP)1+G5@5jm6_6VlfQEK-V-hBZ8qD=(>TX
z>8P59s;bC}f-Ff08=g-TMFK$x<2?wyUI4!D<M{!;=iz!jp6hLZ&cksWT-U~S99+l7
zajcEMb8s97(=@48Yj|djp0xa<^R{<?d?26wGT=Y%0KE0K+fJk52{c(VQnx-Z^5zFe
z7T;NJd7I<$1nE=?BN8EE7(}D7jaTRebwfwhWmH8$mL()vM3e-=-Bt*_9uWB81>k!=
zz8}VYz8~Ow0j?L|c|M*S;Ceo;<KZ|V5N+GWvMubBFB8YMaU2`7Wl|}Z@y&9uxl{k@
z#b*ruC2;@a>jAI7;WR3qAZxk8^KacZ@kirJ)r%w1IO$Z9STsg78YhuRl1wH@B;&;5
z2GNLyuFGhuh$0I}5{N>GIe){`xn6+l`nZlCdN;>A>FGis`k^-rfIz@UBtRetL_A->
z3j`b&Y{$d4T`bGOvP>+~#I#Io%fzuQn#~5q^)=!`ec{4g`M<vS>>Zx~+{XogM-Cr6
zjf`Kil^a&q?fb@m@3sR|?-G=#(bkqF8IKc-B}k>yWHV_p*#zlSghW)v&_y%}6qyZA
z_YmMr$H%lbl82^+*=%ApnpmwSj%niB7M|k}cpiS>BLIRZB8W1gEF-BJqO2k+I-;V1
zq=BU31q!Y&VmTg`?P8iHt(J*twy-S|%WP39tz%YJIHN!IA6vT9{}-70g#q}*uYBz^
zLVk%BPiLR=jav`?+4NfLytcMB(y27@c!EqiL$1Az_Kp<o8G}qrBC3KWfgG0d@CmTJ
zfTrWqXgO5tEo$W|)l!N2`Z}#j3A<Xss@Jfa4V+dJ&$jVh2jBBfmSqG<M35CERYlfx
z<VXZ18byo7QKNB`NDSGCBdT$b4Lm``@g*!f1bVC0qGh%)%@*}qmEy`gDY3He>Pydj
z4{+x%1i<fp@5a+8`6bxa%>(LJZ@lMsesp;LfBAAG)!E)oBAFzU&eGn|PIo>-cYB0f
zOeCg&DuA@{y<PyO>r*uyinSKS^)jW^RVvF%)K^z%tgm5~ikOu$R-=y7GI4A(%xGN?
zFYpP1AOs)*q9AOPZDeFwLDn^t6Cg|^&{ApiWC}f*K~H2*qiG}~fiFjJ0~yl^!VJ05
zq}6KCY}P5PEMVAc3opHB$8Q1u^>YL8o8P(qG+G|-SkDVK9h)wE=-!c)YZK`VxonPP
zGDWVVoxYxS`nwZ!B_&b{s9^zRBZGyO=Tm99tQD)QEUi#jn4>&5OLb|1#@Z^)Qjuo0
zirH#nIS!WR;`jkB;0fRhBL2qDLkIyV1Rw+;6CeixvM8X65}G8TX&P!YhMq{EWwRKW
z4AHiBBAFa|ybURmM$qE8D44cKt<j><XwqyoSzVfk+Ct^(OLqMZ@XtS2QsxK3X~aCP
zX|8hNw{P9|v0_U)tFx<zbS6V4lO^BN#c+R?fp(2H4YV+y2s79KEI*)Px-74kS(;m5
zWonZ3sYz-}3)GgEsg+AK8Vy>GP0RPO1p!x*@MMKRk_bc*K@`Fh5g`O0L2$AYA@Bq6
zeeit*-$(L&WY<NtZS;B#qp*gtw1ggyqi3>2I&#Ev9YotYiKIJFV{NEv3|)?3s4`VW
zLXrDeU6PVtyXDZ|Uw!E=3HZmK*#mz4v<H0LtkQB{f5W}wf6?;wd`D*o=~RaHjt&L}
zI@!{jq&FcD3o9ofC<1T;sM#*7<vR1T^DK^zvNkbBd3Ku0@)Ff@g?g(+)Az7M0b7y@
z6d7b0VdFGJk_1FiKokUohkiPK5FW_|K?p#fhsra7A7;sd>mzzDiszww9#KKWP*oy{
z1d&`DMn?znjxG}Id5lyiYCKCIM`&6em3oV6y}{b@0(Nn#an;4U-U<Bs&-A>Cr*ZQO
z+xh406+iclo8EWF;f4RB$Fo{*M<<zdmV9rXtwZf>>D0-oAfJRrxZPS_K%v%RZhn#Z
z(NUI1j#HeTq`0s^rBtNaYSHuqELq0Wbx;*#ML|&{6j?+P1tcM?2?{~5QIOuK{{@_^
z2L^#pK)4Ny0w4(ll8he&cyfRr$e5mw>3Y;17sIxQ6$->_HH`IjT7?45Qh|8KI*DAK
zST;}6NTNzQiX<Ql-7E)g^qaTr`{<iqdht5&Q+qYxw%hMGji6t^+H-BGZ{528&u%@u
z@a|NmgZ5mGwzeGoo4VOClw~+85r0^e69BFcRm){@t;o#i7z;;^usSwMac-7UVU23D
zK|KgCWf@;p5mg06RnQa(RThyY0a=oeWC>9WJ)t0oCmRxc-^cYmJkQ5<J#5>?w!>2o
z*LB14jBsMh76=59AYkL<#0Sqsaa<y<OI#F*>jp+!mPls@@vd&t`CgLkz37QH>_Dbm
zGbvSSEY43O)fc8-dfC}81AeOdo@|<}(<u5mEgDbt{_Ayjee{8`!d3b1KHA!Hw0Cqc
zJlxIhO-cG<pgipTCt|%qt;NjjJTr$6vwZY0Yg1FKFD+6mm#MoRrXu62Dx$7oXfnDY
zp(zrYs-S8*nh`;k6#|5f4wn|L>w@p$xo+4AgFxVUsIrW%$MF0RV3uvuY=(6`+p>V*
zq2>lbM3hB*NyU*QDvpHdI#`W5Nyo-*G_mV-tVRv1*&v(mCzkD?Ev_OGfuNU}@%q5+
z_Z|88d*AZvmjT89(F3loET2Zw&td=Z&F^oYTxtB{RKdBhE8k69Hb-Z^i*1|p?Cy)u
zsXi3zohYp|9iQc5naPncW)JRX`Pgv^vojP6Yg9~=h9F>RDuSk=X$poWV`wrFBSIt=
zN7W;^o{QOP(Wq7M92-FpnwqMV{D3vjb!rhqcRbG(YW0>bD{{*B++3^GO4+t8i?WJl
zL{ar99uh6nq+V}eHk<gqhaySHs*E6rVVK~9?|I0ML)3Lh2_o@G486ULXm_4;Pao}l
z10=I~JW*x6YO-1=F*kmM3wP!}3jEgp=mEcT!_BAB^fTJfmM!P}=*Yt7TsgU`x3`~c
zTaNDDJiE4bv9nVpEj_f|o&aCPbeUURVe-%+<_{iVWo(qy`FYBfGF9KBB`XBFj-o3V
znnFaAiN|9k({0GAPQ6xTWoZr}@S3`&9~$WIy<by}eVtuh;}=|b(fs1_a_Qz9Z?H0%
zq;J_aD{CeBs;jRyL{aRx_wGCUgTUW0H#>9g(!%^R))!a%1W6^HZbQ$cX+>kyYBiem
zI*#k2s!G^#BMJzDgeMBrL=o3<@ESD|OD?|a5IAAcJ8)ex9eHwb6~T|;_HN?tgGb)=
z+800jcHpc3tp~jI*3-=hKZ}W~arwVockic5mNJyjcazQL=-<@Co~=2y<z%8f5`0bo
z>vfaK$!Vtc?`P@oAyy_PSX*AE+-%Sg1WZjs&^2^TCaNnWVo}n$b~HUgsklzPypEx(
z`v(SwuHUwE*Z1*-2Z8F(dhM}9T<|@2aB5=w*#{5ozj}OP>^Yu~8ck)9wHQs)p;jql
zwVJ4^jH;>#qPUUJ_~3fzjzik_NoX2IHiOaCMYgY>?!h6_?RjipVzu00dTI*ADjfaw
zUwicxz`{=i;N0x=X;l4`cJINFmwe^s!=JLHc)qu%kG5Pp14F%>u{pzVN<@1Y_yWN4
zV6|Lj{P-xd2llgg<Os`CQxsNLsW>)GS;o~h<c(M_5z%OC?<ARNqgpLfTwNlWNZh=A
z$F9$Jb>*)IRv)j=B1xih=-`3p%+5}~WAym3mjt3BB(hxuqC&mipi!?P5};`+f+%fx
z^57&0Q=Usw)zPzQB3+&2HVx1-G)%g!gQf#Z>s3aN9^_ejhyDim{htWHFMRRKr;+v3
zcs?z5%~x+f_DMm{<a)Y$Xv?)Tyt$XNhEr^c2`7)yPJplF1}v@>89j8ExqT0^JUYVi
z%na+r5;f1GsVexohN`Q?beVKIMQ3*(K_IZaFpVMx_n&>v`5)hX=2`y*G=5p1t5&H>
zh1I23e)rqo_`~su$vug-E{u2<+jgl|O8Bmgs;Nkl6ner95NeK1+Ve?iI$AbOG~Y$n
z&=5UC!^Bf*s!f-PnMEqg)0Jzle!&&My+0O!4?J-HX>|P$c5rO&Ro}UL;*)B;J=2}<
zroE$+En9jxb0|Tt{?LiW2>>=6pV`F~#ts}{Zr^^EM~|~SH&3xzp$=G@MxbkGx=bRX
z)76zH(~+lCSfN&0UGL6!e`4>M=X?ry!ZO5EGBt4155D*Q+itz(O@bC9(Uu26rdnRd
zu}w5pMcmkqy&wR`#c&)len8v^L73?2Cck+zn}!Ba^(f1w1|!Fhv#BHbrI)<$1+V4D
z%$mp@?H#8P_TSidZoc!C-+yrKQ%15QozM5s(b>tiZ9SZ|DMpw2$oKj{)pVJjoo9UC
zJ{ArfU}<cO<;6uxje3~n>KdZ15z%DQi5UHZ!>C4-#hD2d(ZBgQ&wc*;fjey5dO|<v
z>e|ZG+urrwx26(_iSK;pJO6iWX-3U<^peizHsZntsv3>}1ipYTOISeFaga<Cp;VzJ
z%dDy@v4~DjUoUNOnOavTvvZR#ot~M#7<f#^E8KC%?Wa-p6KuKEy!t<Xc<>+fWLKs;
z-$O^fiyhl~IBQdccKMOTWgjTFY$hhAnRxI)77iX{X?&cO<t56k77ba((KIAoC89}m
zcI4<E+J<SGEKD3TySq9+a_)r}|24nF`HP>{iiNdz{>Q)l%ZIC`8_9HT!idDEm5W$r
z14Ry-6y1&EJjroMI5sIkA`*|Hb>!$A8eq$gtz>g;tk-Og963&ZzU>QFUG=ip^Qg9d
zVST-D8fibqj*Lva;FDjy<6p#RdwWk$FJ1XOJGb|6R=+`3deq5A0L6yM#Mn3!_dmeW
zks~ZljI*-5LdCXdDl)F7BkKw=L!qaqm)?QRtS-*cD6NiP_^gZnh+m+k>6c-$EWh(p
zpZMs<Of;n}KR`4Zqf%VMGMmV<j1Rb;559-yc%)pHge;>a6GZbJ4D8s-=B-1Bs?Ox>
zGONoA<yXJ*mCpelcmx2C9Xom&ZI3cLke>PBfBoK<EGgN$segdZ?mWA8baQsE@t7K)
z8$hAfVD#7sQx81A;*ldPPEN5_Sfgq?CzB0Xl}SW328M=d&-XJkeiS8eZr*$5IlskE
zd2IDWTfMyg{{Q&T|NN7{NYl~12}3t1t}f!aHi9IFQ+K|P==m6qL)!I;8aiq=Mcbx6
zw(j0WcW<6@!{*45W9-<r^)G=xd<4)BA3EKV|8O%>?K{76^MQXdrPK!ay4k&>o3r|K
z(&D3Pe15=crN-FN<0rwlG&RlYdV!kf(b6_DT~#KTh_ZR>c9NNPCXViBpuhW{F23}+
z?|VE;E04FGd+vE3s#MC`zVh{NUc0UuboULBZO^m5x`6L{NP+-@Kp+a(l0?(<Q7s#>
zTBowI#!4nhHXS2jL}<$-nVFt^@$;{I@kbv1ndR*}cAiGv2|#&X*Jr<R$3NEn==Q;Z
z0Xp(|c5cuASn%0CtQ0GZ9y!X)zI`knIm+Vn6szm&)O{aQRX4yVkx3`nzH2YCs&Rb(
zU2b1K|Nmb7x;OtBkJDh!FUuAd7u{F9_Koj5di3zwN5<#3l%g@Zdj?3P+9<EDgrmrU
zK!AWJNmz1#>AFa!iCL*oSX!ajk)fwop)D0-e0_b}-0aLnJnVEto|~OHjXdC@i!O@(
z#b>|zvBkRd%)!B7Iy$@9u`SP;ea1=f@i5P~QmQa=_z2VY-_O#q<19>1Qz#Xw`97wm
z5$GzKD%0MUVcVXwa9xM#qx;I|KjXYV0{-Fq-~HxOWof40_~v)~*`Iyz1D`7umZfAm
zORB8{t5v7ftZ$TNMDTqaNyPL7RL4VVn$*`ztSqh4)|Mm@)zLLsTwPwe;t>E`U0ynk
zKH&4;xap4%&(^NlG`NlS&MvlW>E_J72yN11x821;k<lYZncKIYrDMmKp9;ZO4}yol
zr^$4-=h(6LZ0gktD>EbW&w1|iegpXWQ*CXoeCgF+y6xs0ul?2yH@%>^woE#kBio*5
zac&Yn@R0-oUm)CyWeMAHQEVHlUZ=QPpi*w9y`znEJVLp+df{_l@Uk4R1|Xk%-UX*T
z_zsNCzV-Vz9sb>(P1|YDcQZ7c=gfg99gpgzaspUdFEMiPF!KlYvv}+{bJNqTmr5Jp
zQwekxLsQ6icd>QXSriK^RF<Yj-u%{gybX9t*1Yb#{Z{+@3oriryYIdC@=9q<t(HsV
z+B=C9*QnRZVP9b&fGFZi;CMc+>mxQzs_SLeSJ%mA;w0h`){EuMYb(opfgb?KYo~fU
zmL7fP_4kZ?sI6;2?CkEPe<05pg9*CThdf^pgmh;s#WEv@4l{RPKg-8PSeTxnSSmlp
z^L6)hvwip3tgkMzGIjLe`R8Bwh64{iaNw!DOwW4uWj{RkoU?Da{)e|;Q7o*I>+B|z
z>!8)F;rV`;j1b@p;D`dQ>mxfZX05^c>N?Gy9ENTn3Z7aj70x*cz*6bdtplEU&Uv{H
zefArF>&mIzK<_5H`?}aWl%hZK@PVO_WooTl;rQXB%pW|+>ex8*Gt;aUi`0BC^n99%
zuF3TD_OfNi8R7QSD&KqVdCz>47x>4X>T7lD%|Ec8b;;#lzT?h&uBcawv>J6%*>;L+
z%hYR?u+<*{L6Y!&a6B8u@eoXlYN<-KQls6_iRc=|!pfPu&pKZK0=c_y;FJa6*ME4=
z2a2Y0-thJzI(s_VIh0{IAt1BCGDXNTwO*|=dTeB)b$*P6=@5MNhk;MiWb)nJY~6Jh
zOEcq0UiFU4pLgY(fQhHg1AF$lKNud|G_!wXroUP#(b3sOB9)<0uMrT015rW%l87e?
zc%F}FJ2b0x%Ebz8ZAlDGqS>f!&gI%uKuON!+D}RF9Uh&2)$NDo-rhH~n~r=pTLyD%
zYm?A8L2niUuvBj_Ix@oSp~I|=jj=d2&FWf#hU<o<7F9)874rEmw(LBU#hEd*pn2O1
zuYUC#f$68ynvIW-%<R~;`_2Q$#`|lP60YZyNM%@CUchl35QPmY5P?9F@V$V*b+H;P
zDy1rxX`(3#)q10EX>p+!D9KBU3#T0T(rvj--@0x82h+J;xvRI2fq@Qobg3jB#jjUw
zwV0TgV)pP+3gZ(jPENB@Sfk;&Sc-zDsVJ&MM`s6HcAdrA(kzl&zw;%pxb|rWz7sYu
zxcSbgp<UZ*)M&Mu#1d&VBZ6D2hBP1nAPV@RfKNc+gKIg|D-D{B7OJk{dseboSm^~0
z%EiLUDFwbuF1<|nhc8|CzKWx6*|BMm?%ob|^hU_Z4*@R-0-Bb^^z0lnM~_jQnqp;U
zhLzP->b8w3E4Z49tVrZ?S+?vtlTu*`w_bSQ$``-vjkQ{B`f2;{X0nHJZQ0gJrDe35
zb<(L6k!Xx&qZY=1A_#~Cf`~5&;ry}V&}uYkG+O8pjllP0(`*gEDL57P;E}Nx+<Rp1
z4SieAq@z2}=Ds97MmSd+Qrh~Mw$1FqBGbo5C{9kWIz7Yk@-lU^g(*rns)C?Mq|!+?
z?>Li2wan7k;UgDa`kXh;OihnJo!9TBS6wriZEIUvEKClz8VwLc^hgXrln8<_8&(t%
z`~cr^!r^z%!)%!}8ZA=kI08PNV{ZbGJ;y#}z<2TG&rkgA=fC;BXu4C&_x3T+pJ6C1
zqHb_02Z4|6I4rHMGBGkrVPcZP+ycu>OO)$%Oi{p56;Nd2u?WLkcVSy5jn(P7H@^98
zZw8J$-Pdqwd8v>{B<DpT7_@B*F91z95I15zgpeLYl>Bhs7y;i8a4d&bqlN9bh=M?)
zR_+3j8@2K&1HfDEJ@AI<)y9R}_wFX&+rj1zodiCC55Di=I5ve+g~^FY)~9DE&(E_o
zKS!xj!3qLwMI}%b3`3=VXe+8_urT^S`L(Zq<FE4*TF#$twy?Nh#S*DCMV9b92j34+
zR1Haz349+x6c8m5$(L|N5nl+&mpsSCG(#$20jO0<iT3V6SvF$nQv!V3_ne*o%vXQ-
z-fTxVojrL5y5qEK0m26OEX$-)tuZ|_&DzW?wZ#Qi=I1G{7il^!wj$#xGKwP8(?3YI
zJ<rUMd;E(oeAfGBCMUjg3Pmx#Aj&mGQNRz`SVd7nltct?gP&%DyIK@CCZmG@-}SI8
z2itK70Mjz{QgL0DOU3n5V%6?DH1dX0)7!Fp#{fM&ZS*B1)WF9NJj_;;TBFJQ(lSdk
zv(y(CSzlOWZEc-~WnoJq?nc~~$>r$k9bj?tFwZ#qjE`Do^HZl<6+zQ=TaqMXabsK)
z5JhQ&nM*(vL}W$A7lo6=>4N8DSq_%v5ClG+>q@585@geQ`X?b*yzuJ$r@naon=`pC
zI=j2*Z#PJaK7kitHXGFIbykaI7H8+EE-q1CT4s4^g=)Qy1vrXKAW6hyG5UtKQCyy-
zJ!O3V^>2CC2TsKr>finS$2Wv>#87u62oS^#=6(SrNkl~mw_pep5&}FgBu57iL68DT
zl#nG+dfG48q0#A=7wh)sJv;j7?n=@T5fJ?V%WP1qRw>sSEH5rmURj~Bw#MqxGUZAI
z+w*V~CER*dnS9?MV&LOeS7$H1_I1B=&s}#^PelNFzOO5?jH<{8fsf~fZH=N7GIlA7
zjNrHkVn~(*Aw8Vy`8aL}K-o~7Xe{o@(OCRxy;v`N>C0mu`KK>k8&75E=<1+5tzqC}
zTPD>?nQEiKTA{$&@)E7}b;>KN6xWNGmW3mVc(Q~biL`Zel5T5fZR)Uh`DK^Ce`R^;
z$f*dvWUgEE10kWPDu%9yB00W~D2a%^geVC}qKLGSeE5QZ&qkTc4;7jS9AdiBY|G_b
zxh<D_S})kX!^baKTC1Epyla?_T%5En;5!bDT7_D@PO)5Nd2xxxdVxk^jlx=idZUR0
zxUz&NNkpPiI(s%zS)F6smcjqL<nrhL8>gtvFDx3hMzc-TG<3s2mIMUBM-oK>Nk*1H
zk!57h3mIAiAAx{iLteu5JObAxmCY4v<$^EQ%1`fZn5CuqO9fexJ38CxOzCJrK(k(@
zTB%TPwpd#$P%ad(D>ce%>y*nCY}dgR1w2_slqK3ax)A~&!LH3d`|{WR>EisXf2sno
zE8p8@*-npP7-&WmNeoFZWmy41KoSEKSw?c*lWeUgntA;IY{y0LJ&Z_f9zZrCv8U}~
z4Q@N5`_3<Z^YUz_olH7TQj>747S&RbdZS6HTw#561*cx6St?N~m1(tFxPU9kc#=pg
z9w*b*PNTTMMHgK7(c?!CjdBXxN~t!`G+Uj?R0bmw2T?r9T_`vp<0FeA0s`U&>O#VF
zkw6sid>;vjB~nuWax9U0+Ah}7v8iWO>y3dOLmAR>4OM_fwL+y*rDfZ!tre)3%Xsw$
z<@F-fYBdz~6T%@IQI^TJci~tq+R};pFS+cBf94doyB;{W%eFl|(b<U}jS+YbuBH-+
z7zn0_?7OJ4gu7Au;{-?b1{162x@fv$MIzBz067wgK5Z9kb$0d=5kW{L<HQXW&u&p%
zFVJW<sn#153I*&&6Q^3GQm$aOOk4syNhXj4jA)E_GL2PP3!d?UD?ahy0}qr>bpXyU
zm(Eu;gIGF;sz;E#7J{c^yADARpm-vR;Ny59BY()$FMuo(2;jIbnw~6Vvbi|`Ig@>Q
zCLwL@UCFQAc;_>s5uJ#kqst<VYMFAmgk`y`6+*oY$uenFt2F8jT-OVqQb`0!BAIE!
zwQYL3I_|&dl8e87s)MgkD0biUz*nA`%H}YV85A+V5Cjy#!wbN+9b^Zj4M|wv_rmTX
z0R%||G4z0XG&UWHC6+=D7)v}oYk$W^`pcE_miG2ebWK6TrMzCCUT@H{Yzk{@IIR{z
zt3|C+!!*rM*jWrUHxykb8c%^|`8#%=`N<#t;0Kjc9e}y+O_!8vt%0pux1mLo#6+8z
zqN7M6jvr91)KTyeT?fwzg|UMmz?a0ZCMXE_zDFvP8@=iJuQdSVo34L)X~hlfJTKC;
zoT1zA-S=kOG~>~Tj;08hjVi_Ub(*af>%}s)S{1`}FdI!8jb_Lm5BQQuAc;idNeoS+
zRcm?okF9RswQcxvSrQKeE2kp(o^!#O;^)71{nc7DDWu!;=!QmGQ;5i6j@xLNsEUk+
zf?sdoSQftL;RBu^hQ(<C1Ol?{o%>GwTshm``IKKAIoX{p)|%%{%&uN?|IG)^TdP_-
zYpc_3-O&J5kq~^B^7<O<>+3X4i?#J4j%lL%9?g1#R;xwed9We=EXgv_SOQ51sMw-1
zGhO|Ik>x|b5jT{{;okQ9Hg%<L9`5b9gQwBF$Nw1nEv=k2I<xYe&YnSxL>faf$)@52
zu7hd2h@yxh3dlh~({^y}P%zOKLMk^Ti6HQZ#^TL*JpJIwdl!#CHM?P&LPS|ElrLN^
zR$n;r;DO644R@F628yC;Xj%+il~5!H5pb;*>%}U?a*1Zkrdq3^dM>VQ(`vME9Tz_c
z@Wn9p({!C^EQaH{2u6}@JcDi9dZp#<xbyJbj(d;Izp*VjG1Hlj+&rAme)XJPLq7zb
z)`#l%92|M0EgH#O_a+ogC9Qd+6LD&_8j>Utcs{BqBKkg7vxVc>;W(=Rfh>V66L=1(
zO!oM|=B+1Bk>r8RTc1)3ab$ElwN`0dd1!L%HB-x#OPxTB=z4^BI!$LJf?-4fpM~|K
zh=C7*hix_~6^oS0H5#Uc)oP)O0*+<TGFy1=21Uz8uxvyObWNvW+PFw)frp_=M05>=
zD2^9UZrS~-)#{r@=c}(fHdnlDs5AZ_?MeOXK<ViQzHM7K@7*^#|LV@3A)=`?hS;Pd
z6-U=Kn$0GnDByb@svv}Yf6W%I?QFz<622@W$r3`~(9=KkqdRW8{$w>lzT>8+hE`m<
zXKQj~dgT?Pi{)QiESVQbia|2dNjw%K5{Y0K5u%X@sZ0u|Rc7^&8@By;4)to4VzETE
z-k@dL;5eX2Sf+(#*`c!dMx9DlB#cNDNtS83HnuMyS{8~TBNJ-xYO;tHj}QnVmhH)-
zOO4A$7s{7)r?j^|>x@mG-rU#uCBS^T0Pv=J4*r%cM%p^MH=#(7(IJ;j;kz!PB;mS#
zNLCs6G#gD?jRvmgg$kas42psz_(Y=-uWw-ZhmQ!K`UZxd)E_?E*(Z(8EWi9acO8At
zLeaiRi^S>5caTUVh{j?h5(!f27}=yjI;PN(iLfx$;BMC>P{6Tm%H=YZYK?lciDSE{
zfkz<t*p`jsxClWIdOuk}))X{N4>LAFLDwS~nu4mxC{lRTB;bb`Ga{-c5z!M^9xOFm
z&-~htCZD-!WZ~L#w{`yw8`J+!Wy_=!SL~lyc~yRJcPL;eHtA_kk%%X#ltLjS%d!X@
z2f=ozS8BAHEqu?z-Du`e6&VSSTzmVm{(<2iJpzFJPhtQbn_M{Wy6@ig`=g81t0gTa
z^z?R<Oe9I9l4P@Ka=93tX`Qy1L|h5b@Q7)!?lkZm8&8z5OcT%ZsMQ;oW|*02l7Qz1
z*tQ)?TLnIXARvkos;Z*t8UZ4LBok2t3{^x|MN~yXl?5ar0N*3<18mR2bX_b#!bnDF
zIRWE^*7Fwcn!NDxGy6X|*p>RoQ#EtmJkX!`)PLRhemR;m+B)*6f=fqCpexsgD1f)o
zUS*jk*fw^(L8Ds3vF(lH%y9eFG#OcN*s^`kcka6FhmUAJkng(fhflsDa{u<k{?Uc^
z?4MZs&4w$t=Q?}IX0oKxY1-Sfba%w*ZqsQq1Y)9(82AJm!hD|V(`=b|zKice%QV5X
zX|!4=55f^7JU_s3Tms+cM9-Qi3TUc=qNw-?NP>?pc_9c5nP|iyVi-tLC<y2|HojwH
zn=MS+rsdc)6cr;Kqh@-s@7y={2i=LeXI*jb@E`INBqqA<j{ARSzT{oFdFL>?p^=mt
z40N^=F$~ORogjc#%fxOr!E8}0mZ{epxSo$Iinxl5q$;R_Pb!(H?%aFMV`_f#&b{Y6
zxzhbY?fh@uarDpTiuUD+WE-2?+ev3Kw0E|#sV7Zen?_EDh!nPYd%lnB`S@Pg@aWqX
z&1N&qz`XG3bi4q|a&TP_SqO)vZN~`({(>M>EEfbMSwz=lBuT~%K=dqBG*rn)R|L{=
zo%URYSS&^$%CsDxTGOIYsbbd3MCw%{rbW%MQ4NEpo?)rpy5QS)Pk!~xO^H7NKJiom
z--XXO^Rlns`NQ9C%Wox-PNNGg20Nm3wq+3rC1D-Ur%|tC*Xo$%DwR^1mKh#rI+8@7
z$mqI?gu~F5?cYyja}PcSfT<_RQQY+0f^hqT$KO4=)OcUR)4F>52FYgIXz$F?-`mDu
zr$KjAA|m?W`FO4$9(emcp6k+TwWwCBlq(e$=I0Rwa9xj9D+Hk9Y{--n;7j4~x$Ap`
z;a>oPh%8I!ni`H6`YxW`AaEoCN5ZoOL_bPgm&oT5M4~Z#QKn)0tkrGS3N=b=>&T@w
zlv<HytAQHWsEIgLQ_J0SxbX2S&)d}Z;!Do{6QKEI24BN;y8r%5Klrc`>r8ayyHO>N
zd>jV5J5Uq_$F}i;fLgObwOq!oRw=KoQz=()Tn9%Kab*QjQ7{ydc+_x)x9<GsLl55b
zSe=kV58m^u|HMWnzkg!+1NV%T-<EFcVyL5oTzfmceeG=SP0*i`Ny-6&=iz%nNRAx@
zxUNg15jGVpEH1JzzrfPsBFlvWk|^OhHkM`M_`yaeu1_EY5QyQ=@O;>iHWdVr<*=<t
zk|o@RL$g*z6E;-6eV2+VQ%y$6rIV=f7@8`Pj;M5`qpasr%(v%QT5PAXwt`e#My?f*
ztP+x*pssfEy$2Wnpj57Powd31w}B_+G}uKKKTG+yfBn{9FW1F0w(b}}*HzMLiyi&l
zq++pf(3}9vcEX9lQi=N7I>kZ(v(>~Qz?Kz!MJ8&fDA@G&@3=9O>-@2?o}9`3YEMGy
zj&RPGfAHYP)=lM^y?vX>wdd%}cd~h~jV+x99eRKq`1oF^IvH$uy?V3B^71mXv$M=h
zPcuI^&-z+{a=C;r3TTEFmI7=WFAz4s=Hm+?a0A=H5BwA5KSV$l1ynhlk@3AyxKHq0
zL?Mj#L;@C730+lCWQlAxi!MvVB!O65A{9-LOh%YZBq>DFh=m1MUm$3d5X3lAD#zVZ
z#n+cAqtO>%y!V}Ku!KID?DPM1!yi2`QM|TyU^}r`jHuXRM_-1X_J?*#&ktBHmnp5T
zVXm!HT3Mx1u3)(?wj|*yGP0%;QAMH=+1`8h`5!N=Ed5vp1i7&CtE1>`2+>!4@7{^O
zYKif_fq@=!?H%;>cd~sT&0t0%A%u(tCp5}@-^a2nR#sOTpO|1~Vv?o#If{h>rBaDX
ztxlz0N6`&(?b)!qC2;T&34)ClaREHf3!5c3l8+PrmZdP$^+W;Baj34Z;WX;VBE;hX
zp6lVe4zdWcBqE6-ZEZOuNkRtN6oF_?BWkEjM<XojQ3NeYusTanUWdR%N@p1>6|erm
zJ;#IBzWCy|^HYdAKVhdGhsIui%fb2gwRH`V&a|P6He2!$w)c0VNKzPM2LaV)ljVga
zs!Pk17MECGTcg!#VG9C|EQ2Bwi)cu`$=2=9_}0!nXWsY|k5PB-IrCTZq<!m_|24Y2
z@_(gBTXe9emyXU3hKD-X*%znV05$OO{1XI`VWLqgmzkWLVq#>3rP&#ZtKk6AdZkRc
z-k@RIIId4jRztA(;oPq;1RL|KLD+B*h#Ox!AuR}^5Drx<vWU2m<yLDIDjRdtK_C#1
z2UI+dNzcP^96ZlM0CMd)BqKr)1Vja&fw+XO#84C&NmUUQoj{r)C@v9L>m*Zc99$~A
zJaO}V&ENR7Yu@o>IL3SM$mkW<-#hV<NTyfIb#$Uh9=%zSy_<W9>RQNxN`URUEH1B5
zm|vi_w9MMlGL=dN)AvKhFjYa<H4ND&6_1yn{oEJ*b#cA$6V(9Z;uEZtluBpg-@fC(
z2M^3Pek<46N4~p<e0L|?huhiKsgY9x@B_RJuNMRXre(9Rw9M$SW6X|@vc9~;`r0Zh
zg>}{{HR`raAWB4IDKfbnnx<hk%3*gi0*F!wvmn63#}xvk4KM}>A+6YkCzM42Q3R0y
zMU`oqbqZ@s;c;D052<v9dac34<P4@|<JdO7@6pwjM>h<7M06pbH!2|a7>H6^D0eC-
z1foK)z6e&4M5dj)CYE2H{rdNofdBQY1mC9q-m|}W<AeVoM%vr*T|F4GL}$|Dob8*)
zCF0>pQQ+efuvRQHKRHEhVS)99C5r3ov>Y2tl5i9SQB_DpRdDNEbm@!#VdUt6|CX{u
z9y$8NQ5SFB`;7d*U3b^t9-OVcvS-s4Iy<}Q>(8@uIK$SgOl)Jz^)`U#2LaW3or#G_
z#*Q3eWqOL@(h^H6E6lH#sF)UkER$$!r=u%RTU!T;s<OJgOsTL0fgg?pp4?=^pXs>X
zNqJR-hrT8RAPXW$0-`9QsVY*;Kv86xjS`CsJ^=!mTqmvvvvW%{n@vp1B=9}Dd;2gV
z5rRNK^&zhZ1YH^d83F_XLBJOzyut#iT_Q+za{awizxS$(w@d(^`Bi|gP^<6y%vW#z
zmmtzP(AVFOp((V*9G<bgkN)<ylXP_;P-!%onw+9AHO>0$94kvp)EW&;1Z+hCRVE(Q
zPy(CY{{91(Kkr3<_dor9`SRzz=n46t-}=EFTfcbY1D~E+_b=%m+(N#qn@xjxb`K^P
zN{FbOi1&hxK-Xubu+Hf5<4her%KGdqYfFpFEU&U$sbPyE$+mWS`ufRrbRh@=mC`!%
zQ)840EBJwrs%c^AMest}2!ahzieWrMaB^Y`z<0w2N=*h;76}lkHB8#l8i|yF@7b)c
z%!4S=k?%ziL{<uAZ0Gm}F^@z~Z!fwL!50ElM7j;|J9RuSeRA9PfqG#9-LDg*d&C<b
znEZdg_TpzA0`7Vu!M9W>Z#^(I_pgE8zN@>tkBF|3GHlM;+Rf&k&XW%;f<Vi5n4O(x
zd2F20>>P`8^OP%PTE35^s`#ox#L$Rq5|VG*FL=o{e|+@tf&cLYNIrV_m+t}9WanA8
z9h(1~t7P^J4i3|m&oeyK#h!sUJqE}dh0S1NOLSa^*~KM}9yq|_=qSaxS?1;zm?^AN
zv}}w-lC7Ht>FM8us;ZO=D=f{;P%9S*Je$C7(z1Qnpo@@vk&}CD5a7CAczPm)ZQ>`s
z=zBh%=b_31x~5_n5sJR=%q^`d>13Rqd^-_c#;hz;QdM$Y{X|raa;?U}W1}dFjG`!X
z<@4yeK_GyJKu;8$E*;lR<GCK5AI7B3(h4y{r(!4DzJ1GmfAh9iUHKxOpl+J|$HunY
zv~Tj?*DU?a?w&qkkqAl6=FBZ!>>BJv7DHM!1aQ27`K1-6j~{1!a+2klS=I{$nzoIp
zD7dPErmLi)8iCW`!poognUQ0Me<~#&dF0sPU+M=v=c4C7`?KG=>ocC#zIkBN09`$K
zwr=iXPme*T8g6|dA9EP<HBF1@*;$SsIKcAA2y3&mOwG+RSE^vi3i*LShPP}Zlg&{p
z7nvD3PNlGn@7f5Sjpw;^clV51Zs5%>u5Q;113{D##b6_u05|ZFg^lfZgFr_J0({TM
zv0M}}1fU>@yy!(Q`f4`YcI;c<{?=>9rx&)gx24H<c3{`nD6MO>b!{RNSE)5C92=h`
z5{aN`D(xLz$clm>2<SjhOrX_aU|VS%*TeO~mUX*XCY4AtU20x%<862S9`L_^>1EeQ
zblcs>m;P<3p`6p*-A6nUA)z^(xwV5cxAddS(n-=GFA!K>FEVlT7^|bBtWM9cy0lEq
zG-=5)uBIYsD#@6R=(XtR?706$SH1dAf7)x2Uv$;0e|b;Y(XkhQ;w!g)%2qPnLqkL4
zd-Lqr(!uV$7D}FOY)8Qcc}=z1WNd7l(ftP~jE}K6J;UU}B8#;;N;1ig?K|1LWgEWl
zu{1Nr+QKxh)xfn{IIc@N+kP~gZU4`gUH$TZTU%SZ>@WWMZ~j@5Wh8k++&2(T#+EK1
z32ek=;qL4^E>_Dzz$X?_Q4Isn^Rug~s~>#Tt6u&2vC+}j96EUL&BsS4hx_{b5!3>u
zb)B~S0HUl=s#ckpnI)M_q8SG1bQVDnkPwKA0exwarWM6BoiK}bU21`k=(q5aIqn~s
zea{<S_{{5pJAPUB<hBQn?3x-c{_DD9oSE<LBN2;|P#ty;w{!OP0ivoBCLJ5Q(ORX-
z`0?W`A3MhC#3V}#3sf3)TB3-hDu|jA%5X_OF(X=j@ylQHyCcUA|I`AEzcde6GR14Y
z@uQJXO0mw|=1l|i^mVgyOFKI|6p|a^n9oBZFvV(>k>evwA3DV9*eElTlT0qIP;^~V
z-QDaw<81QXy_5?p%ugJpQ7PcN4vj{GWHLQBFtp{feFKC40?dw$k8$of=Nw2U;?-))
zOoZ)K!A8L^%&^^!SQ9}EX~Z_@d0Q<D*Kvp&QM&To?BBot(%<;a-@FpIuD`$k&v)+J
z@zt@>(cirN_S@f@XxeIrprIL2(j9$xlEhl6#?1UYi9`ZJH;6=I1VVrq2&84`$;#AQ
zF)Yi*cHQvks=7i-QCMvx6L;Ky=zss#JKp#*;Bl8szxU9wv-eFEKOgA1on84J645Ae
z#bx*AHqP5MNPGi)C)TChXfi%J&itXntc;DbI5SJBQlSZ0s)C@YL?b#0L&j;Ax$ybd
zd|+XA>b9Tdn&gGqsmC3BZlvQ?KRmGbNj=$}>F*z)r$5i0tvPnI$wUP<vZ`=9^!$Le
zQi-F74u?_*<6}%sO*6T&N<$Rs-MXDUXPrwV8f9sEjOCe8JiCcwwXiHZ*t%`kzhC`|
zSAQ6IL@+x%JUrId-F5uF14o__izg5zDg1@uZ$6m}1S0r?2!Rh?K&xrdYML0C1ldfM
zF(mo6TW)^ayWjg;Hvr!5-Fru`c;1!o?r874^_E+2`Lmgc(apXfqZ)A%Z5_BxSX^1B
zJ-13CnM6@FL`@?AlmOawsI+M`8VOpajqN!2o`dQ&$mMd3E{<Pu*FE=M1$^=GyeFa>
zx%5B2|KMjlt$nzwtD8hLLQ?hEy(P!_yN5{X+9Nz)rD-xcI?nX|{VX3JVc~=%ndf0@
z8t57kLn9s4aIGrOyy();T>iWlfBa{?F8T83z4&nj-;H<N|EllZKl7<%Zd1Cizn{KM
zJ?z<%WqVe_IC=ZoXa)#aS}Sn;;34J?9b|cYoXN>4X4cm6qEWW**~`}5d%^RWJn{hL
z)p>l^qEac7&gMogdCs%`AMkJc_TB%O>)5yN{@Tu+JMOyc{(aBzJQqb#PKv1n0eC@x
zNPr-U_@cN`>k6=&HuYMIcpGF=aoY2J96fU61;>sadJb^IiJ!l7_s%azBKpxg@4WL9
zvy-D2ONx#ji(|wxG_4ZLYwNV-+KI*E$g+$m%LG7F2<VCnl(RaGdJNkRn__(v;*v)t
zk``~j_uy~5?RD3D7pOfR_vH5b4qo$Lw>|JtM@r>;y1R)*bW)nfo~@mnw|kJ(qrg|Q
z944lwncTOJ<)g<o1h_*DWK#=eXbnRp9XD{zDuYAAx4i0gZ+Rc!{mcLqA4h(`J0CoB
z&5ir#Kb36Xl<w~zpnss7y<4(uON(eHz!#z~RGnN|;mE%IEF3z_%GelVQ`5|q%E;+7
zXFTJ4hPLgbT3Tb~*nV1-0<L4yXqxQYeb!fY?>+PV!14d?da^@9Hzi|Vdym;NrHEmK
znXVstK|cVO09h1qB@xes!1M8JhgzjhyX%sQN9gS8rntJO-FC}OfAB}||I^za-pO*|
z#g`u5bH<t1e))@E{N%j{_q{Y4i!-ow52BG|y<DeQE|bY*&^JiDB_ZTXNz2fgmZ?;u
zG+QR7<IwUw1VS%3HF@Nj$45tB2K>S-T*v1MzkbvHxeo<uHrd<NMO0Tw8v$o*&vVX>
z0aCj9DDc@#PR%m8??IN29%Er*l9jbp>aL5aD)^cfHYmgmM6X3Moj(5DD_{2O$BrKQ
zxtc5FV@D4?F5vUz$cw&y`|(d1>Av))O@nM2=;4el8MdSZ)RPBZVa98D9&<}89NV{#
zg+qr~7#(GDdYYwLooGJK?(?2WPyY~W3)9Sv9mF$hG@CUX$8TKp?C1RXORu`-Z+@B>
zNeukEh6ehNA38p{Q^;gO9W&2H5D3qN{qUMZQN$4hG(Y4ssaKoSs|}*LIBjiNa`}D^
z9XWp4_pbZayMPZr>enp3^3|_?n`Qp1GInJDm5EfAeE$%p>#@3Cq@%NwSS*gJs7M>6
zJ(>Wyh`?G}qgsv9GA$g(#dUq+QIRzx$$k5ezUkNB^183^bIz7jDrNcKzH{6Ex#RHS
z|B0pZQhR%jn5K}4!5KSxIA_}?5~>`s7ldVa>bA?&%p7C)-_P9s11yYBu(G;B#kOgw
zDxR*QZGcbmEOcF8eaCx$|6Rb(t%WD2)0tlwe1aOi_+wwX>C<YeyKP`_h)o0CoUtW+
z5_~+&`<brC?80IQzJrID9~otGZkClslT_a(&V1Izw6%9JH-41msiOq0Nwr!bo=8tV
z@5-0_KJc~s@4fq{y|lISo^jrF2M!(G={hb^-N5&}lZ>7raUviJIFg9#c*w4c-Dpu>
zuMkPMk<F%Q@5<9^)cM}^*Z<KQ-}KhIfk(_Wcs^^dd&6tr`H4^d!`F@-y#JhRM;Fm(
zf>NbHsZu4A&SH2jk}QQJ-T}nLfLuakJz>zO8<>`j9r#ERWOMC|%^kbwzWeUG<l)=?
zPap3YxgQ;x`p{j+3vW%f_0X1WBdUqy;sR&w>gS9teZ&;;VJeqUvm7R;XBoZkJ{Arf
zV18_z<>e)+woOY>@O14Y_%zWa@csG=U;2voPECy8@{3?co|^c@bX6QJvG@D;Pkt7o
zBR@E}nZAK;_HNCxIr$Ly0tf|QJfG=>1x6m+$Ks)b%pE_@`1CAA+aWi+g)=U=m}EN5
z)Y1K{&5nR?QLWX8Co^}w?u~E#bzuL`eEhe0^EbZnjj#WDqh5<<+S&*RXg2C69vytb
zO1~qC*sh1-dbpNNrBoqVuMuy{)85fRv(aREZYukQFZ}z*-~NtwUBzRixaQvT?q7fR
zhd=s>Z%>XKZr^+Eh1kABVZBIKXD1QEKvBZ!J3$c81c8hZkWQ&oDmuDph7`6!Kq8r9
zeo9u3k56CovjR|!rFK0qdhDZ91?RF{N1jYNO;mxdjKbNw2iY~yMMM(u{NUuhshJKF
zQ!|X-cRz~<53n#c&dSO%72BevX!wSPZm1+<2D%)8@3~jL<eEP)&E}VXQRgL_=Fi`p
z+qZc~{}*n!|DS9*vw8F2W_mYuvv+fbElJ^I%y-iBc|Ozg3mm)u0TvG&WNu`H$=NxI
zjzj169h`B&C1{$)*uncKFHM2xP%f9*vSZIzo_W!wzf*5C=YO7S+`etwednBg_7AWB
z!7VTG++JewB#!N1TPC6)goD#SAWB%Ghwgd!mQAZxr(7tZC$nVIY3l8D9LHs8Y4(io
zeCIo#y6m#c-td@yK2g5+6<5FbgJ1Zs@BV$?;1;31qn&E4Nu^dN5l^D|KC&cjw7>?$
zCCJ1i3NeFv-NdwAJRc%@j94<w@#)1Ye(#-c=m%zgs$}DV!&hB**XUoCEO~QRcQ46!
zoVXIu-4W%SJwt5kZATNs1WW)t1S&0?iHRx3?!A}ALx)%xpI~)$g|cnaR5b!!Lo>oc
zb3_&JY>Q`Hc**}=D-<3VbpUy-@bh)Uy!zVLCqMdy?|z~hB+ech-bznjp52=>Y<+mb
zv61asuFve^G9wS}XYt@cW{(|XVs4JI=hL(240fM)A)+8Kdf*=Fg;{*hp<J%=tc#!X
zvFE+;CI9Ca$p+U;73byGyyBm3x$U+qOQm&rDA$hXd6WvPVLO!|Y)tTna`Tqwq1X;?
zqeXSSL^M+-+R;O<qbp>53IgtV@WAt%mh+ESzwD*&0v^#&`Gz<C+Giiwcks&bqX({R
z?|eSC8$L+6Tn7<9Jna#M@aRt$A!R@;uAo;mTBe0%2Y7-;B9&(P=v3dak+DmGfBA2{
zo)L-P_TcF6-aoeb`;wN7ba%HCGc*#a&!*lC=j<M0s56aBfailC2zUsTn-*i^6HMIy
z0P_d-votZu%IYdr*P*FtVYaKQBx4#;O~SDn3~$}>fns6hFCMSN_2&{ReA~N!SNP)h
ze)Rt)3jPZ>Z`&FcnK!qwJu9I<3VgQbF~7XZ=)Mi`9Y4<G+#D6pr+3ep?7i?}9Lr?v
z@O_x&6+FkpvTT3T;N}lr`0UF+SZ_3fU-Uyh^I4aC|5+EDfAfvE-uc|#{z2N>JFu)4
z^>Qf$AOe9H;D{nkNksKLq?UzQsZuGdp(QiK6G;NUEA(AKz|oP3m%3m3R^t3~&wBU6
zgYen8dFy2_dGTL->T_SXxU{|&(>t?NtMzbLCmIbY^EQsAWgxCVA}SLxG#U*B*Z1)Q
zjaV#6AZZ*pI{M!NaQE&#=l$1B`~GBdrS-g6GDkL@CZfuubr>4#;OyN)^krg*8+A_s
za04jTn~aT)F>&vGEFC$*;?xu?Yirazm!_tHp<x&rsi=mbh&X10d{6J6HtV%Nc|6N@
za<l%kJD2NjzU#er99eqz;MOzf?(JdQaE=}AGLc7t&+!A63Pp||JjmRE1I!*f#?;I#
z72l`tjI-Ev{zaIr7So6B#j3C2*ez_wZ(Mf83;ziC`$PL4AN8w4`|dSgeeG*McKaQ7
zJ$rF(M%mNRMMqaJwq;_q%uwIf4<$w|Nuuew$d-jzZ%{3)qbF8L_r^%3v*3qBJO~1Z
zj*eVfuC>1Ug6CfRhjpD*R9juwM$zKMr8t2C#a)9G3tFT=ad&NT*Wy;RI0XvDT}p7*
zl2V)$FYfN-JMZOx@!w?U=42!pBUxwfHJ`b9THif(rE6VXOSF3hc-mMTCK%tnGtd<&
z-(h-xyN@;Wn*f(klinP2H!`fELN5`gE6ipf`gKY?jHBRYa=yEYSTE?-Hrtfb=4Je3
z_on-5+m0|>#_z?91A4+ZVjZ+4A|iOpRin2fUEU`e^Wupxdb0-<$5}DU;Y5B<#1jC0
zPyD&WbsY4p=t9(i+;{JA^?O<<J-j>-<vVvL!5#RVR<MV~+ZNNO?HiNlv)YyG-T;K|
zd1ogsesg2vdj<wDcpK*<svc*$XwWH-`vX3Y_a(*jH2+LkNEiPkR_}Zj|EE)z4jV$a
zlZAoTS$b{Yg{uVZRV@U*?cCnwz1PV7Jm)FA@_3%F77lRk=GmOOWHxoq;u9~>ks&E|
z%90g348n#BTWlp;)@gRRKK}Tl9^xqUqkOR(jdgW(Po~|EM~IHojz-Dmw%P;B9*&;7
zo&2XZ#O;!2t%Fdu9}|GO3fCD6AA0^PWYHl+*~pe=0u?*3HCS)9Bd0igdB>cUV?b-f
znRcCvwD!A)`6{%Sn7jQf-?E#xaqcG%kqU6`$_(UrNDBa5%2+&VL3BpmAieiS{Tj3c
z!1LqrG?IOns5gxs|5)Q1`Kvy#%^<1F6M7^l%DpC?)s(}ZuYdKoV+*yX;8cZ2l;~ma
zjbClxruc*8m8mcyFJt%JwF{-0*|%^2LcyVZA;}$L!5J`Sb3<o#w##c{Yg6V&yKI~P
zE78_Su~O6W{I`TpHAuJeEq!$5f7Q&icD};&$vWV-YtY5Pan8!)wG^;(?rBV-S^D~G
zTWoiaYQRBI-_-ael{q@59I{GsIglSdqMzGuiakgx)+CWo7RX^tA7xMhW!Dr}u(>xj
zCR4dU54`ccy^YT%8odIb-R+y>2{xN^y<IgYHMO;!;GDzaDW?smCW}0~Q(S^Cn9(By
zQ~fbu`HW8ibV^f-OvEBJwH)MQ;;@y*r^LYFAGMFqAA)YTWmDN<<W|OZ<DNuu3el`6
zN;H0c@WnREFPzKz8(Ki`T2k+~8!Fj6c03(;;4dnE-N#3Y@e3RhN1gq!kdgyM1rb<E
ztUYE|!p{BiN+Zl)>U5{OY8z8D+2Nsl#pf4$ZF={|Wg5B)pDAN_RLk$_`QFJc*1UaL
zxXVHp>TK!gz%3L11AapQz`pbIr#a^&8v8E<9Y<tVGpAyl3<;}b{t`?1&e3^~=NgD{
zdSq%t_2;nf5fvyn+1(GjtHB%UkR+PzTw4>FlO8go;nF4(Ob8MhojQ@d5>dkeNYD_o
zgiX-;mHspVDJf$<C>ce*oQOAa$|Ip|?@h+n46op$$n#-1T+4N(*?PLWtU=&IwT=V~
z(!hZOZ|UzEj%t%eMm7$MX8z_t)WEUnPYdF!SN!Y&9#iu^K{V6R<OPrZ)4C(#{t^LX
z^f|}|HC|i9sxy-o2iGMX89wa7<aj@a;2o}`n}_<km}i|mJ?JfT7nA@AVlwhKtp);e
zgpm0!czFv$EmS|r(1JEaVZl>$D0B$x6=Knw_t>+4gRM3=qiiZ`mm40yP(Sg-xq@%p
zeM26LvRfIYo4`2^Y$kFiry%?LLRso^OX?A<gJRr?*YnooQ5OsD0Ak<&<G6a6*ovf%
zsWv}b>vJ_s`x6m5?%Mv)WozqBgL@(puGSAf>*&`Wmp{bw5NVK;z$7pxFEo(<B3F?e
zTego`6i*vRO#D`dvaCORSK;$wjAn&rYROh}<Mvk-+w!6htDTm5xQ}0i1{!F>5`u*s
zc+JV!LkhzxB9ShQF!aA9<L0UUS?jgrZx7E@6w7&C;ka9&Du)$)06NN}!F76N_Om;o
zCOTgE=N5`csC1h>pP*p><uj0X0Tb9j9V@jtQcJ1HGIeAbX*HGPw5c1B-)i{WRj!=E
zd%6(~CsEW%uMxw-M`9Pb#=$oQtHHsL6Pt4h3EZn6uaskwI0P_|GwAAm8kn8`HYdZU
zvo;UNZFY;f?cp(mbyG+YWP$^vOgcjjnlR0dJYD^E;03Iw$kZYq>+bVcACFcG@}H_t
z4%<&A6BRj>V5Q~(tCoHnA|*1&^EX&bSmGg+RP<Fd1WYlpOpMV)F^RMmKy&zI(Sn6f
zU6P_e-|m?uW(l?zy@u;zy<17Fv!O^$ytN@3aN^lP;bd1Hie}dkQV~1i<|D)j0+mzp
z%CZn@CZ}qqXp*X3#*}?|_ha|)<VP@%dN7wv4s#J2zGu2&P>)-E-{mf=J8-KKaLGE}
z*jQCfUgpD9T0yic1}!97^;xVI+w-uw7yZz6DbeFy5dFXq$C51=9F`Y2**3P*_1urI
zX94Q={g}DZ#bM}{^iHgACaBuTa%1-sSrWCiuUlB(5~Tqozna`AtZFZw?k81kSL}&F
zX2yHyK54D5ZDHO0XU8Kl?8=+&&AjesNbore-R&^ONt;@VPF~_;DbL%}K(;M6MGvMJ
zy%FtjBn}+qtpo;U2JPtYQ9j^E<&eWnr+t@U9svb~A$<b_nZCkVC$ntkQ6Dt;#k<Ll
z+*2)rV^9TJEC)!baIWTa2uNk1m@N`l%Pd)29#k)~I0??{T)y=BG0MV}!Z#8`(d`#1
z{mV_?$i(`7M3e00v8}U3?pB*9b~9xHy-1dm93v%`?CYY@%wKE`-)a4}nqB?a)xX`g
z<SISikaS`ss(1N0l?Tmkcar~^U7p;o!8{u4-|PyZCn(Dnnoi}P0LsVtEt=!F$`@6>
zk1G+oF#@R&+8#De`t^;UCI{B@9oxd;A*Qcnp+`Rp+V3mA;spb?k>@Uqldkm69f_Qp
z;~+URn@5p!<yS`J>X=bpf%J78VKT{URv<$9KWbnyd0do_oMQY~ApaKPBzcjbfOvyu
z<;q1gKB{ny^*MI%Au<`VJnk23Ac(I-@+It}f@l%@Zc3Duoc#$6bDm>yF}tj-E+aW%
zbX+0E71H?Gn;F9ibr_%bE>h)iQoWGi;Qko)>*?<daX+&Yo$Ta1)8(|~Q_(6)Pz+m7
z9^a}X*8CHx0pMJ21><g{zThvO`&0>R?|xg@718e$q%m=G&GS3;n=o0>T55G(sPy;+
z@I_l*FYxLP4eRIR45C0`l1ZvCW}Bgx?+x=5$ODy2+)n?JcU%U~vz3^(t*z2^oIKH`
z$rV1VA}&;1!AzqBMv9Owa!rz~9Lf?SHVbjCcLXgfX#}S<RNZ>Go^BHOVEjUH^#LB4
zCE;OEQMA*mUB-$x6Te{7PC_z$L&Qj6LJZ0HthZ!X$gB}-X`hkgQDoCK(D5bG3vKN}
zJhVzBUXf)pQpNt`RR6Zrpl70Q{V5=Ks~Ezn8sFH$1M@4Fo4pWfF(Uo-J9>}pEIO7#
zL||WSvVE;6*mnh|_TIE-pEwZz9}YM4k|pTu7?tsaHFG1e(_bhR_T!bJ3K(j)`JxU;
z_ecm${uyD7Sk&LIX3nDVx1(F>J%7X<Y|{j#K&o{uca9qo4xfUaU44lbOrI7D^jw2)
z{Db^`?M1ydIlVjnUVvK)KG80Bc3vuh&L^0Fo+9V;z$Y~7x8LMK4#b$otWgkh(mSbp
zyV6rK3NPkcP9H<Aov@MVV9lSXG3N14(HU~zzw}vP#s&2$txIVlY2toC|E=>%4Le%?
zTcs>Zq2ECI$H@T?6v~!ge&u6h6C9Pr!}@e|mVquA8-Af~mGZ^}A8~0k@jFdsG-6(1
zC(aHuI6qXm7u@aC24A#GqAhgC`qQ_1Kl-?VhCN#(Mf?unP(SZK$tPCdWPhmnT8$3k
ze{*S@fN|IJ@Qp1^;LcivDt-`_u+3GeHZcFRK~FeZqFY(#4qG(!op*g+DLDPt0Mww{
zId4%H`oDg|G#}a%)rx~&EC)V$TszB5>o{!jCD`y=Eu}D3BqnUOEnKm!qy(o_@ntIk
z`lozHOGB!|%KUK0C?s67VyehgXN|u87IRHZg3t8YG{X=g2@-wjR1}X<W|!#be8}`U
zt3CkjCv5!Ti`c^&d!L%Nv%^|lqfs$i=B#0j295MX@qxycVm1ME*3|8zH7sx)@#6Uk
z>WbKx`}VKka{S5eLEIoTe^r!6&f7NkI5XsYS7Z!d?@dM)Re_naP2~9)QD{x7)aEOn
zqKU(i&axmJxC?>$cRHUbo!ZBvw#7x3yxg|}w1)nhwViiI^<^v2^{CbkuYs1bjJV57
zS5VfTw2olBL4rbK;$j02Cl0*6{3k8o5~`}+xT7sylt~(tMuNBSsKxnpDuCG6+e{P*
zLEv1ny>&8hmC!E3dLbrl7{Rwulp1Tzav|PI!R&O(*=C&zoQs)l+j34$fYL9UahNfV
zDrH)ye9=&2;S|DMF&gbNQz^)|cr9)ka8()f5Thy-1VR#rLg@^>78`93Oarzn=e_Xr
z<o#`_0`((4-;Uh)AZr`GREZm}nwZcsF&Jo3Z4mdeZ1U!l@FHogk7R&irZhZ{%|9=>
zlIeaR^EqF-Zx24WS)E!It~<Yj1wVV+D7^ermNC-eovb<(U7|%Xg_*GkIB(2y%+1@Z
z;XXCt#?`+sjpF5~m2^J_;!ih}={m3~fSsPx`b5n?M{WP3i|PH+hP*0^Yh+~<&<jaM
zk7cinU%8?G)l6y-p_5(7E-*g_M6I=R@b+sUDkPsgX*6*{$)~J9*<m%x3%YTo_Ahpf
zKc2C8AFe#uCP^ATrz30l92SpodLQ}caZ=_jKjn;g5A5=YjFz~CsgJn@VsEjjxZ|W{
zkd>3q|AxC+MS5xI85TAPywxHt`#{yPTj4166WVdfnE$T@+A%ZY?fHBx_`y`df4sW2
zBiPynJYDrcU;Vq{>r^IUUJu6D(!HO6eMi7vDBGt-W%{N*TP-_3s);w`-yK78@xcOG
z$oDeLq7WaHQ2f<TLL-@{fuDQc;yQirk;ery>3;|F4*fgF)@@d8G$_=soo;dln)z>(
ze4vTn*Z=~s@Qs`{mRdUDS@{QmUx}%|;OhJb3klAn2s~G$9Z%}Y9Ix?t`y9z_il|7;
z&uj9w8D)80)K_dFCH2ikw5qD+y`J88XiI#Ow9CaiBTWn6dlACXV*SdxgLwC@`|}T-
z*YCm2hsESZm*KLA$Hm~s@o-3Do@I{OemYTQ_B*yL`gCOr3bFc3K$w=<5)Kg9_E9^G
z_q1WGkphhQQ3oQJDe+~L(M6}2x_!h4`>6Tk1U_70j*KtJKtfLO_}XOKWvxbsJ;Rq^
zC(WK@QWRr|7AdaU+Yi8l%zGv)!t7sSHJdMF`wbD67js8+8|0bGw<XBGdEz1YU%9xt
zzu7eUx+9Q|oHdu4qB;ud>NNoJzoJ#o*reD%ueVAk#>>Op!-HQ~DrTOeNQKLfPXbXf
z-*tzWg#8jz=SAWZY1%6F?mCe85QvC8K&)X%J+8xZW;3=O2=|-WD%mTUQm{78M1bH9
z33X9ClfRG2!pAk|j~{YMu|kuo<TV8Fd>OF_X^ls2P{H#or_?C(ay>FVeK*D^uoA15
zI%hh81Zf>Yl2`INnmVtH(|@NE_@uC!wd~KR<s9d)V0a%&ZuYlbPa*;`5k79nJn5tP
zkNpwk#!QF{^6t9^A85FdtvC%<MA>Z_k0_>{C~bsR0-)%zv8H)Tq;!op)s&s~)i$~U
zMYnO(y*6Mm>ZE%IGVHUz^q4Qv9&GtAX)OHL?E)WRh6oKOf9ML?^snL&);HE4jNX+4
zX?mzZ()!-NhFyG;Acr^b<lt%R$j1z5YUAl+j`Bo6A_Nl2wJ`i!<ky-A2Fc7em&g(~
z&E8OU)i{kPj+9Y_yk{cRAtOYut7cBOiE|R-Z+CuJ36|XHz<DOr3*h6fbD~I24bC*w
zTN3To?W%LV;cCdDa5eyvq^EA7I~X&nQ5J0qjRr$5LOg#&)8ry&?>?pV40szlQ7+vV
zkLTa?!Ok!1PF}jM1Ps%(u3X>yA9o&9^EbNt_v<9v&rxZQlQJnO=#Vh!;~E}^Bf;yF
z(W8fm?dk=xOTU4~9*}*|7*e~BHuTj{+L7IGq<HF`sm8s2<KfNnXjl`<lW1BI`WA1E
zISAHGki}T}J?q1|PRGej1NNkVMlCiDduy}AOroHq;Dr;*m+7NBmn9-L-ZxCn;Cc&W
zGk?jgQu%6weg|!=5IqPj+}>PQH=5PV|L2FU+bud;si5zZ)5C1!k_TZ)__%n1&QAYs
z+3~5tACD#u5BXKc-%c?-B2f?b2?P@KLGyQ(thBH;%7rd{u#E|2b!(y)W616@HqCRG
zyJmY@_t%6!fr+ODcsZ$LQ+WYi8yA&fwZ2SPRhm9anJ#GV_18e>|6CuhL@W%{X|lxb
z1_oW=Eo#uS$p@~O*Ns+7f4(z<#)d{VMyo+c(|Bb991{vO^A6@rDZ8U22aXqIdOvkj
zIpN;R9xLeNfnR_8;6w?&c{(w^sg1*l`v5-e39QY`&W8RpDsNhRhZIYVP4@z&^n@U3
zSgFagaFB?iAq0eG{$|@s5jAmVy20qshWLk$Y!g*<QH*s~lL2$a5om2wPfZo}mh80$
zV}lq^(^cZKKkTuz!a*2C<-*-vy=^c}-N@sEw>NCbZ|m^zl&4%f?en?D`I$x?_3zUF
zhiZ-d*dCUYNl>h$Nn<o~DEEfc#l|>dFA?t2;7e)9R74&nj2~40qZXlZ5HZ{No|yP6
z7YCQ5zl+QEp+fQ0vYim2U`)#-IOaMCRL{!$>N{lC^pXDC7P>$-0K><^S&J701Ez+Y
zn(bOt$7U(fx>A*`cb42}Zg!T$U5^gOR`XSvlbrrVsOzT|*Ha)_5>NY6l}<M{7l&JE
z_xkAVZ4IP|zLj1+<E_?URGSiLvZHR-eA!uGJ3Twy-5vb#0xwsLtf%FP+{okXxgP^R
zaH3(NFnJSloiP_jPA%qjSnYhLR<FmU4lW`{7TJ4xmx&|boMclSs>5w5I5uKJV|ZF7
zn62%g^FrA5!E1HxTK#09?SP)=#=`(C`qdG`%pvFumq}jLnvcnYP#%+3zY@EzxD~p!
zu2(peO_oq>j~&#UScoZr@|6>Q6L0|$4({$Nx2NS<T1};+S!%HKbtt*LHbUqY?FkV<
zL%6_X(3YL|&UylDqz37pRSwBzfBJ|}E1F-lY@)ZrBrf=Syvc2b3cPTbxhLYMCF<lU
z3UXIoC9o(mS;~<z9J&%mK%6K_>3-LN!EpH$YfwE!%KSjT0!hH7VpWU14;(Ldqs4LF
zWxbycF;mMvrOGtlo-W6yY_Ma6LIieta2BI2Q4Uuqm#%DzH00idpk@b2m*~oBU2YXt
ziz^h=IKIYrUJfmVY|JWq($9&?aa5Q`CxPFH`95xkAHDDiB_QHfrkxot<GZa<VV?Kp
zNw*jGs6ahk7`a7fe1E}BxfCRHW+c4#Q&r1Pk!xchTP#SrZA*hI0}v1X;izWF_B7Hd
zHTRv__k{XIy<|$=8~wqFlsYO<;#N{=Z79*^15&+0r>%d&rfO!J#u&y!B2=3C!h@V6
zopBnNbi5MkPuFpfv0aYaWh-?PvGJkyq1WF^;?)7=!dp;IsRX4~g9LM-J9tjTlg+Vm
z21g}x3*`kfr%H*7xL&C|Vl4yyQqrgOp$UDh7dYm^ZR&7_@9hqittRCVeL}7Ki!}c_
zO;SS;4Y<V(2p|M9c<`0x6YZOz8#<Bm4#rLQ4|vYYvPF$aMh3-dqy%)G`6j^WNh8$Y
z8x*SOY)x3HC6h3!t!5`c#hR^oa!mDeZ?D6|&3hHeU8ORw=3oz6Q#^{YfrT{<k)O}N
zsKJQlOR3tpJC2;I38{flR=C6$jIF^N9n~LeB_9e-;s*E)Y!O0QZMe%y$<e1HABXT!
zC=+30ei40-;Mo$<?1M@)T^tqRkE(V;*_U{@%av49PwI|H`wD3#C0hXmXm-$8Pz;z2
zSyG?t<D<qdHvtI&(>qnEhpwa|h;F<8!;ZQ&l8N_2=Sh|^o0Q}HN~4n3RkG`}{ru<Q
zf$0{iIuqCWjygGe^T@G3D7tOY-+^DCOobWD+U{V|HGxLTN}?KB#Oslufny5|#Y$gp
zgJC}!BH6s=yM}=hN*|?#ksrl2vL0PXU&A#4`>L*UI+(I};o5dGa^kt=Z-1~XQ^Tkh
ze9mBToqDi~G2@(6lJ2Q%TUyTX>yMFfuYL1JQpOp<7EZpb!^f4zNyOZA;PSst+dP<e
z_f2OL5{puky2p{^Uzx1;$gAY11Xuwdjp$6j5XimKCuFNs!MO$!!Q%z)^7}BvnM&~M
zXoFI3JF4;;aL!V5D!%}JaI~7RS&6o_xkL6<+Z%^CoXjmyK8aTrJF<^%>QOt_-F;r`
z3eQy&#u~6n7n|^-_3d#n+@3jG1`&`I2Y$xuG(HVLhI~0A{GFi4o<0fv0Yd8b+sr#L
zeIvxZR39i@{zxBajCF6(XPF`j!)Fy#+qT)!&!Q*+i>q0BzJfQ@S-zkL`3p_ibu`@M
z+CIa}>%7ia-1A2-Tf5osOhkGIBa19gH-~J5u*22`EJg%>#PYe&gGRN!IXHZ*2zBk;
z>b{%9xbF7;I8C3m^2@_(hhl7WU~rh3))Q`R{wX3NnQ-n0OF1{E*{ow`!)MOX0V~4!
zs``sul`h^U--o9kXh=~)u8<7Zj}r5}jhx`s;b4;Z&#AQ<w*41@M(RE1Xe3Nbnu9IQ
z&3byNKCyI(2#yxt`7Cn8LwE2Ex0pMP8)Q|t;m$?Kd(VRv+_3Ipd0=e9&Cf43w13OG
z)ux}l1uET{;u8SU$3yZ-6tfrko{KEQ3W@nd_>Ev8w=^q|rZ)%9xYIgxB~tN>k>A|j
z(#(LMPg-ooFqJ0|%lOa7U%KEdW%dwvHjdon373Z`?m)!*Sc`v9jFyy%8~(rKKct>V
zs)gyDHdwW(RFl-|JRVsGv))iTvI7+n&$vI8GzA*wm?66PXXp7L(0keMr2L#<{ASsc
z9eE#WnUnd;Z^Ya?#d?ncS2-+%BZ3|`?2Gv_jvR-nf}Cv1zr#eDb_=ko((azag^Ehv
z>d&LKA8O(Y_0A7uDR&G)SJn$D$<bi!028G2j9(KI9F6~}9eLjZ)>7T#cd{hBI_W=a
z81BhpRK1=fxC6H!>LmmULF+1}qu#acE`#ngfcl1W8W;JNm7EoeUIn1KKX)*P#nX>1
zn1p~7PM4b}2P4|Jg3up9>fZ;6M=yb1Ct`H4d1%luvh~XZ{`CCnWa7JsnWU^d7d@`V
z3!DjR@WB2qX33pC@WRdX-%83^p~`(<&L*(QjUH2ymV?Ie71ZA#tpMvnQ+Y5lO0BNR
z*X#rZJrhkCb?>4;HA3mH=uG+ntbA!!)bODx3!j#P3Z3zAuyXVHo|SE0pv&bn;_4~s
z7sq_f5}$x#gDwBvGg#c;LyS(x4GU=+ixj2wC5`#nE+O{x`xzWZ0qUsIn(&(B*gYTJ
zy!_{0ICtm9n0kSOQf|N=>4)>4z#FbN4S%cBW6unlV;g%dZ$7?YdBsEWn}kq_027Vy
zt=8Goi;QoZFS6}g4E#fDrD(|a&v#7B1Gc-n5Xs?|<F!<@6!g=L>62ZwURRL4DY`5V
zBt4TJi^7qC^?rca8rc8Gls-$kpQxs$dFGK|r41pLkW(v{Kn!vRBSxnBXWzdJVT9nj
z&n@n71nk9`>T#0kZkB9Na*i{XR-&ED`o}gQOB>_pgZmRHP#IV)d_iIP)?Vi8kK<ha
zHL5;tH%;{`$6Qa1rVr~;Ct#kdYtC>~E5DX62S=9k(z$Ay@0e*=dTbw%D@*u@AxXT!
zy9DC^zso)O-chi8lrOP{FvjjXh|Q*RME<MEnK$I+ar>5bRpA)$q`0%#k&`w~otuLb
zFMUqeP9Vo>Bl(MlA<?@Gb5M%(41uPO=-(V`JpBwiv6n@F7>GUpNbFi@?R45Y^!zU1
zUqRQWi>P1^v-7+h458$`73wfo*3pj}$rkZw>#41}HGF>mC>kGt=G>!5<%K(d^6#fa
zmpIx*Dj5FlanaqSqUhQ}=Wg5X&n;r^UVA-{q}LhvGz=LY;^OAu)_g<0H&J>9Y_o7>
zl!5FygNq_XBvFd}IAv@pp|)B8qx@nDd}wGmAK`(#R<rD%Qt+_N8SKA0wP*@&C@)Zj
z*)()M9a6rl7vu!Xkj5hYrT?bk$Ro)|8Fm63Z`#<D%~j0Eg=W+gQ&47o4&61RsJ|Tp
z93$f=I?4y>@5w^awaWNAJmD=*^QH)6-3&54WBsDqA34!%n<}6`SVG?PB{%~`*x5y9
zv3x0HvV;zqT}j2Q{DQ5I=dB%ko(LpxiES8pMut1$dRZJ1<kWRr!HJrq=pD5N=g+k<
zR0yz2eM_*0q2bU(LG{Y~zE{IOz}GKZt3(yg&UyFa_l*~X=nm;n#75=Hc~?yR6oyEI
zT0R9%<MVaRap0LxhnAkP64&G}O?X4XPoT^b6;Zq-j+NGm(3UAAm?{^x3gC>ascbUP
z`D~Y1zE$E5fhd?D1#Fc=S!Xk*gW<h<>hZt6n*6jj3(>yeaqbK}q*ZQ|c(6OINA6;_
zWVBS3`dKi@2+1tS{jOp3<As1H-qdf!AzUKD2m|}PIPSoe;S92EMArMi|4Jh2B3w`O
zcW6%z55@Qd#r=E#JaSZ4j$5U~d;yws>WRb(@*_iX8Jm>pvG4jFKnJ`{HlYdx!!u&v
z;m0dC$E}@bv#VQg^wOTUZ(NssVN-Xox$3n?=l=cyag33x>v~&}!8wR;7jc@yphD^t
z06<IrOd9Nu$^vp<o}G1?2h#+2d2*^Oq|<hD%1+Dm5BKwrOK`~^d)c60wVg);2;u9)
z75|6Aeh8Odc7dghL)dWuc_dr$8@?iv#Bz3NUGkAqLAEW-YTa;Ybpl?trhV&wKH|e)
zlT6%pjBh$<eUxXL-R|;jmp}O&PbV@SQqWR>mUyLYP4U~KQk;||NG|gJdWC8g_l`^@
zYhZ4l5^fI->*=%Sk~|YLik)S?6SFZBtSrm^wA%)RGyL)C7EDF)q`m-a@HxK!^<mrD
zfhl6iwU&#!lAo9u7vGiHg~G1k^Y;TPvDPnXg^bl29FX$)gPB}1HzxV-&GAQBKkH3g
zejfZr+&6!fx?wguEUzP&X5ab{v@tFmD3^Y9{3}P8aMZb|QVMq5i`I{|PDnXIkjR?m
z;F(BAWxgL8$U!GHcDNv-;)w3h71c&~F<2~?m6_-`7b9m8SL@qvxO&_+Ibgr*jP%=`
zZl6Zv;?Vv0)k?=*uPh`fPfAL7_}_rYqKBB3l@`eio+cIPZnQK*rDpX2uOX)@5F#lr
zOdtR0kdf}^wl?Sg@^R46#C_HgQ|D!V)AbGFxq4Ncuk(5MOi^HNUh4DI3dA)ye;Jkc
zMN#g*AxSJrDYI%V>wmkNHrI4!TMM5`hgtND3~@$#J!#$)5hs;>-z>b&wiZwS(D^KQ
zVlR;6T@bn4kF;PXNm9D}>B0G`aZ>Ce2mcTr{5&>>T|Ata3iCF%W6Lh0hgjnKz9ocC
z^Q9Z%HZJygsfH;=mM!+#lT8uP{1xZ*Z@w>aeRN%WQXj(awuFDY&bM?A?r?S5>Xe{4
z^6<bn`{%bP@Ow1>8ME`=^6rz-s%^90HsENQpaG8nIgmy`az!==c<`>VVC0%ggC1zB
zy$zfXuRnC|dyfxp%&W^DYa(%w$0gmysc?5b0%YT{XScqd@lkGGmbsHhnl@hyn@U-1
zY^i;r3D<9X>1N~NMMVn(X6t!{SeuwOb|2jYgQiq?;;*MEL2_r~7m{~Y_iM(>cb%rt
z^?dwVor&?N2Y;oO8{(5)YrDEU<7G-;L5{A1Q$LioTS=8l^h6r)#N)bbRbm3K1n;O8
z!-SWyEF@-k051XP6!ra>azKZ5J^CVk=+-_?+y8u`K$_c6ijQ#Z+IuJ_m%Mm%ecbul
zeLs11<*AUE@a31yl+`P>jAVZOe+i$NP%dA~?dNH#@+TaKXdB}Xx<^ARZ$s4u|GWu4
zIF9KK+C$IjWKq%5Y7Czbeiru*?rC`Ht(KLQTk=!#@@Vwr8K2~e5ZbF>wS;mt;*7@w
zmGr#c5&->qB?Nx~o&#BeQvtl!6{*p7Ot|PuxMlMWhYNw*bhR~Ak5~3(PiROrHC5nk
zZqv(@uTK{@u8+OV2N5z_!nlbv5(;2Sygf6WbUBc314n9xS)JNYL+a1OxSh6{0Q}jD
zXx%wXtAvKHi2+9tOS<Lh>L0Mh<~!~?(lgTbu)p3X^@~y>0$t~ms(cK1csG_-(9x~-
z1<5oU!<<Wsts5jeQ7(RWcj{H|ko3)A{j6LoKbwp#w}?pkwF9wxpv#}csu-qTZBSh6
zx)u)nd#J1TAF||l%pKD#l-@<pucJPYx1RhJ^jSs4&#&Giq=vuMwZdJNPG*Xa4lOEU
zfkoqCkr?-pkx*k8%@5<r@VQLYFkne0(1Tz#a|Pj!URR!_H#lJ$q-dcm8#*p+8-0FH
zI;}?q_qT^`TdxC`jV&NBq$wl1PCyObE(%_bexf*?&E_0pW)Xc}lhjS5`LAUbQ~oNW
zLWi;lEi#dCR!Ko{BQlJ@XU0(w3Ka_ceG@Kq{S-1?Tkx1dvooCZvEzJp{`sl8b@}?w
zRi8n7QCWO^qWP{^3M*)w=<b--gR?4rRN4eXs#f;*5Z3DqvBChmCS7T41MOn0<6OIr
zz<Q6vL-*Dugj9aWT(uSSsHi=0qRZQ+K0r+@nV<z1zqkad_zz04kY){0|4f?)X_;~*
z$y8|;D=xNFr4yAgcZ!dQQ7Q$TSk6s#-!(MEh_FJ*XGy{HeFADPUI+yv-KI`IAN^Pe
z^EAGzH@)2nzP&AEFF-s7-wp!?+NUd@u!y_YGkCQa$SF+!r8sq(Q_=TnQ9sktXgbKI
z$T7WTBKWMqP}Y)YC!}G?#&3Occ-L;*-QoTIe!M+OObYMs^-rj$Qkp}l_tc@o7M}1i
zJXkP#^f}*UWAR;+Hbz_G%NE@4i%VQmpcQdKa*_ODhx(D-Gs5j88tXudl(x|~rDR`O
z4TM^XzEMzW$}+l?$z5v1jI=npo-D$Aq)rQ`f8W1B&YZ9b-XO2_yA!1AK6!pH4OrV9
z$!aL#5f-PjiF_MEfQE_b;o((ikB?gTQn@v<w5gC4JGMwGLx(a2`wC>y7)E(jE*=?x
zu(}e2?67guP7Zf_4}E+dPZ@E3MB#ke^YF8?2)ZiToM!*PN$LQ@LSsl#`JrSB*Cak-
zYB;*Qwpsi`Z24YBM6{a_JaLtk*#CEfs2Gw6xRsSZ`9)@xzbXANR|d>RsVJfpt1nYl
z{lKFgquUs|bN6e!=I41}4@A9x|A+88G2O#R@I$0C+}r35-u)zQDj&DMr<!5Kr)26X
zY#52L*yV|n6BW68I96<b&j?nUir8xyp0Eg?-2x3-B>Q#7F0yV4u;1#U!q3XGXg#Op
zlQI8%x*FNeKQ!LU^z!cF^sH*<7Y;lr+?-vR6ms7@MGn!bE`O14>qK|>YuVk-qwJ5H
zx1iyqZ(PK_uiEq;z|30x0LDpJyaJU|ALTjYUNOHKd(*_8YgLI&OLn0{g;!c?OCjZ!
zb~TDMS8AJ?pJy4=DaU#G7SI1~gD|0ttN0C3f*(2zCwAWGA#xR2GMG|JiV+F1xr(?7
z4w(Ma*Jm2EF<o#M-jYaLbVd;)mr_&XC4}!{G2G(p^oq8KeKmnFM$#g;6N^I##YUHt
z>}w?n&TEHR>?;M*cKu<&N*`c+ho{}5q}q6iwRm)qwCV@PY-aAthPvEDNNk3+kTd*x
z^X#XCxJieWt978%h+#{PyRm8d>li%_84xWbiCGi$CSESm$uM%|m?S*!#j+-C|Evtb
znh$M+MRI-pr_v<aVz7As(qAyZQgi4!HW3gA;4u=pv}vlzq{~;#Vna(|#!o=|g#32f
zUgU||u&$I1v6-`S-qISp+Y^dvyBc)U`BlY@4wzG83FiWa;Z)A{HE{q|?r4^j=pvtn
zcOnF&idXypwAgSQHRtA1(qaKuJ=-q@BDmAWBA#};{NI*S3G(5KIwxV5mMR~1OrhGZ
zl$c@Btk_lQaf&G)&+T|}VhaJ!5bfJJOIC$2JCKrC4rn#`TlexeaV~IC$N8yh>y!hp
zuoUd}Of!RprHq54PCyEFxq%&FgJYQT#WNwgkWknPS4V*iHFi*tsJw;o<T+tAkm}>S
zJ?m30?P-m8uo&UEUvt9+U>t^Z^R{*f{hcEm3RDnKW=sFx+8%dgDAX8up!?$fLCLm}
zb&N54wm!50hh4Csq-gZsFWjx|UGd7dSqF=3PHOmoI|mAk`4rHg;I%otqgKL1DPm%X
z<twV9AEivGV03%|C1gyFP97cFbBg<uKDQf<%`^aci5nrs*5hS_eIU=w!jeft^`oOs
z+Wu2AfbZJi$X6t)(2ui16=pPIsIZ|RnKex|vc2P@?yE<ff+w#0&nO|lZaV0=AjnU!
zy0<r!J?O?eXa^@fBlTCaH+>}=l$L=g?su}IC48H~%XxLEr!;5@E)K|@SUT6S+(WW4
z26d$ix3wztv>lkQ{Nez!iU21yi#FBGf3ua|<wwMXeP$gUabunNaX^_|_7-IRMTzoX
z3Z=7VavGUSa}q-de$Rz5aE|WoexaI>R4>La>uep-yhXa5k)dBRV^2uWTDa{pp%HDz
zm(8&O6-w|6=M?t}TyNOvTDu7;nI^bLNA`KTntxJV)zC9;yY3Hu@Gh`7c*g;sORTB@
zrXrP6eNVv>y7FqYgp);LVC+qLCy!c9F%rtHCrjgE8d_0u%^Zeg@4a{R6;LIgcB`l1
z&Q-q#qsW9xX_9GLV;QIOdSqoXB=cAiL8VoZ^M-}+bJ4mEv?^x-l*PsYa6>G<+OK5S
z#&P7}tl{Z4`EDiZQxskFMou8Tj5b!nF-5Ua|Hq=ky+6!v$h6~dtM-}yn<u4Y5-Jj4
z-R&y4%TY+A3xu0K{aSs@v-eL{HKeMj0I>tsPrUH!7TkW+C#PlbMCr5S65Q>(mOW6y
zS)YBPeW+HZu4S2ZhcRF~Oqwb5AxvQnXIg`Ghl~i}`8^ED#3POJSzt$L4%|6JWa$G<
z$)>T_fWacJ5`Au8%^)a*e%vlwRr^DX19k-mJ(fmw#*{$dRbL!8qPxfTUH|qcv^9v-
zxv-S!FHZP%M)woE`$4gJO4Vv<NmGziUYC#*U0*X=0R))MDJT~PewPOMwYS?lj;AOx
z$H;-oDy}JJzYX^T^SnH%0UcVpLwb6;&Nexjo=N794ybamQIQGPd)5s7@|iMmm)$EX
zQEke35)Z*N=_}(Xt#U<g_0{lN|7kdo#p22=5F&8t+KZC95r(}}?>;9kxE)xn)^RZ2
zQzbK=|6)z5q)YJnl_v0JaF^Wm@BN{BCr5?itMXj)3ZQ&?vV@|&`^brMU}lBXh2ZB;
zMM;|?nWaj_Q)YpkBLJlzr=n6-U8TXD!E>Nva79_-79msp_E*y<LV_&~?++iWK^4?|
zQqd@Yl*U^BP;@gF1~mKJpD8j$@xGd(Aa&pH4}~O^Zz^sK(mjtrB!hN$&zAR8sgmtT
z<TGRm#<0U!8I*~jHL34j?;eg!Ezc@JxF9v0Dr{LGvN$5%c)(AmqsjD2DT6?c5Hp9e
zk3^{FA^;5Q|8G7@(ITI{5T$m7;9Q(Mwj=u7++0~&tbl{gp$)rLk%LfqGsk`gjgWFQ
zLw`843dMfpZ6mc!+pI%GG@&u{U&GGx-G%9Giuy<FPqdQjNYqphgAgHLa1~ELKi=xY
zZ+zFTD^f+i7%Ob~WX&`@byj7}qR;e7z}UA!N2ZNWe0wBWs@bYy@?y#KlnF#Jay%Y1
zIy!wRarF5dc|I!$*ONz+O|~MD=RAIX|C8lq0i_Ff*{Yn<1SJD!15zha!ndqsXQSj(
z-O{I{ECr9`Y@{V*+60^m10)V=XT4^m0y?q!dtUETtJEqD1*EQRk85AiZ67nQIsRet
z!Z=R)krn!|o-1xU8K8~{yQ$Z82O>-w<=Pq?>2**8x%!_D4iq2QKROED*1Wkks;(*A
z_dP|4kVcKC5Mfbt`4)#2_8L=$XNJuh5G-8w{4TLA5Wgb}Daej?;teTCa-BR|F1ED1
zzP+`r4fZwPNa#L(UQYizjScsrM~hlR$;IJusiL$*Q$X9Gmcd+TL5H^xw$g|s`hL}t
z!F>4+oPsV?f&+#{9Y7Pty^U}4qj*jUUm&BbLe?Hm`v`&vKpF}znY=G7k|ztzUPw+d
zynY)cIkrW#bmPSVzP>%1R?qdh=Qu{q>!(3pOFyY`a)^qHyCWuNW?t#IcHB-oh*E57
zq9;pT8|X#HU_l1)oxKIUe;Gy5gBf2~ziIAvH<J67_Z7i!gSYH>cIb9^B_vH+8e^Xw
zWoWjt<d-53ZWPBNDbNTxl<K}~5_`=%e5u#-y!@T4{x08dUEmo46>3N6DKB>w?tE`y
z^%UTFpFaMT#WZJpCn+-9O#IVkN=#2ok0^%x8$)_jDpU|n_EqeLlk9m@qV}KW#1&8D
za9?9sbG{;WNg+rhrZ<Fqv(5rV6&+KCPDWX3_NHeLGL+bfx|YNI5{|T%#qa8>zawG1
zTt4B-&#kU*8tBOod=O3b8F1GAX`tk)e`&SM)&RXi6&&F0T?kIOJy?5XoH0TfiLD%=
zF@~fxKpA>)kHUB<!IV0xWr_$-E$@29_j|Z!u4kAoT|DLu*_rI@-U@GOZn@rWSR}XQ
z<L7>o>^}W>t~|xe&|4yah{W@@_X5Xj#y^wlH(|Rh$lz7a6~3q9py{C(kyUlm(~@?3
z@dCXJNe1)qXtx8<S*+JaL0$$EM&A27O)sX|0H5Jb9k$xo`)4okI>G6>T$TAEz(wdr
zwNQh?_)P{!0;Uk{AWCta%JS^o7EDO_2meq{mi`p>Bt6<&0#sfaiBLHZEi=(*Tj&!;
zkci0TZ!3z5H%Q*u1%VjIKG&Vzt=4Nke2bcINRv1@IcW;=I`8b(UDh?)jNYY>r~CXe
zj%zuji1z6he6QWxNlR{}LC?cex+d~6B}Q&GMm(bBI`Ke4qH`YF?jKA|4Zg(*8QlJ{
zQix;%y`61Q@AEWXnVQXlX0?A>yFMBWwNi0IJpK(p7*zjh>*)Av!1f`J9`k!7Ge}EI
zxz<@-rMa^+aL{W5@qHRKZqVXWVXLs96j+S!E6{FYIZpL^-A*fwhl@ILJTMygI28r@
zI&N@h=q=Z*#Q?j};~<-kk<-E}y}6U^XLNB#u5X8TQ?}t-OTEQI1IBB<_K?@}url|s
z7PEA-1{Nef9$sNiUS3XK0c}2hF&<Gd9zk{<9x)ysT=6r*|8s$}tChWt@Be>6ppDWF
QZ~>B%{5!cC8MCne0q7Wf)Bpeg

literal 0
HcmV?d00001

diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index 205598eb..8580b981 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -12,6 +12,8 @@ import { useTranslation } from 'react-i18next';
 import extensionizer from 'extensionizer';
 
 import Plus from '@assets/icons/plus.svg';
+import LinkEmoji from '@assets/icons/link-emoji.png';
+
 import {
   setAccountInfo,
   setAssets,
@@ -297,7 +299,7 @@ const Profile = ({ disableProfile }) => {
                   key="createAccount"
                   name={t('profile.importWallet')}
                   alignLeft
-                  logo={Plus}
+                  logo={LinkEmoji}
                   onClick={handleOpenImportWallet}
                   data-testid="create-account-button"
                 />

From 160b37625af4bea7f893c2406497c6d349b7df0d Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 21 Sep 2022 14:12:39 -0300
Subject: [PATCH 040/132] added functionality to close file button

---
 .../Extension/Views/ImportWallet/Steps/Step1.jsx     | 12 +++++++++---
 source/views/Extension/Views/ImportWallet/styles.js  |  4 ++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 57acd82a..e7a9ec29 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -51,6 +51,10 @@ const Step1 = () => {
     }
   };
 
+  const handleRemoveFile = () => {
+    setPemFile(null);
+  }
+
   const handleChange = (e) => {
     e.preventDefault();
     e.stopPropagation();
@@ -72,7 +76,7 @@ const Step1 = () => {
     <Container>
       <Grid container spacing={2}>
         <Grid item xs={12}>
-          <div className={classes.dragDropContainer}>
+          <div className={fileNotSupported ? classes.dragDropContainerError : classes.dragDropContainer}>
             <form
               onDragEnter={handleDrag}
               onDragLeave={handleDrag}
@@ -89,7 +93,7 @@ const Step1 = () => {
                       <Typography variant='h5'>
                         {pemFile.name || ''}
                       </Typography>
-                      <CloseIcon className={classes.icon} onClick={(e) => console.log(e)} />
+                      <CloseIcon className={classes.icon} onClick={() => handleRemoveFile()} />
                     </div>
                   </>
                 ) : (
@@ -106,7 +110,9 @@ const Step1 = () => {
           </div>
           {
             fileNotSupported && (
-              <Alert type="danger" title={"File not supported. Try a different file."} startIcon />
+              <span className={classes.error}>
+                File not supported. Try a different file.
+              </span>
             )
           }
         </Grid>
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index e0b02aed..1fdb84e7 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -67,5 +67,9 @@ export default makeStyles((theme) => ({
     position: 'absolute',
     width: '100vw',
     height: '100vh',
+  },
+  error: {
+    color: '#E53C3C',
+    fontSize: 14
   }
 }));

From 74e80b2019368f27a2e81c21dd8f37d794b15aca Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 13:56:32 -0500
Subject: [PATCH 041/132] removed console.log

---
 source/views/Extension/Views/WalletDetails/index.jsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 31ad095c..6c55d8a9 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -127,11 +127,6 @@ const WalletDetails = () => {
     } else {
       setEdit(false);
       setOpenEmojis(false);
-      console.log({
-        walletNumber,
-        name: walletName,
-        emoji: currentEmoji,
-      })
       sendMessage(
         {
           type: HANDLER_TYPES.EDIT_PRINCIPAL,

From c260c7889bf9a3d0a685366d2f80102c60535f8a Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 14:11:07 -0500
Subject: [PATCH 042/132] removed unused field on redux

---
 source/redux/wallet.js                      | 5 -----
 source/views/Extension/Views/Home/index.jsx | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/source/redux/wallet.js b/source/redux/wallet.js
index 1c74541d..5a39df38 100644
--- a/source/redux/wallet.js
+++ b/source/redux/wallet.js
@@ -30,7 +30,6 @@ export const walletSlice = createSlice({
     collections: [],
     collectionsLoading: false,
     transactionsLoading: false,
-    migratedWalletId: false,
   },
   reducers: {
     updateWalletDetails: (state, action) => {
@@ -120,9 +119,6 @@ export const walletSlice = createSlice({
     blockNFTFetch: (state) => {
       state.optimisticNFTUpdate = true;
     },
-    setMigratedWalletId: (state, action) => {
-      state.migratedWalletId = action.payload;
-    },
   },
 });
 
@@ -136,7 +132,6 @@ export const {
   setCollections,
   setCollectionsLoading,
   blockNFTFetch,
-  setMigratedWalletId,
 } = walletSlice.actions;
 
 export default walletSlice.reducer;
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 6b7b66a3..7e47441f 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -32,7 +32,7 @@ const Home = () => {
   const dispatch = useDispatch();
   const { navigator, tabIndex } = useRouter();
   const {
-    assetsLoading, collectionsLoading, transactionsLoading, walletId, migratedWalletId,
+    assetsLoading, collectionsLoading, transactionsLoading, walletId,
   } = useSelector((state) => state.wallet);
   const { usingMainnet } = useSelector((state) => state.network);
 
@@ -108,6 +108,7 @@ const Home = () => {
 
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
+      const migratedWalletId = state.walletIds ? true : false;
       if (!Object.keys(state?.wallets).length) {
         sendMessage({ type: HANDLER_TYPES.LOCK, params: {} }, () => navigator.navigate('login'));
       } else if (!clockValidated) {
@@ -123,7 +124,7 @@ const Home = () => {
       dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       validateProviderConnection(state);
     });
-  }, [clockValidated, migratedWalletId]);
+  }, [clockValidated]);
 
   useEffect(() => {
     getUseICNS(walletId, (useICNS) => {

From f712bfea38b3c6041b8d883231a5f915a47a8c86 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:14:44 -0500
Subject: [PATCH 043/132] fixed address shortening for ICNS names

---
 source/shared/utils/short-address.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/shared/utils/short-address.js b/source/shared/utils/short-address.js
index 49cb1472..8bc96514 100644
--- a/source/shared/utils/short-address.js
+++ b/source/shared/utils/short-address.js
@@ -10,6 +10,7 @@ const defaultConfig = {
 const shortAddress = (address, config = defaultConfig) => {
   if (!address) return '';
   if (typeof address !== 'string') return '';
+  if (address.substr(address.length - 4) == '.icp') return address;
 
   let leftSize = config.leftSize || defaultConfig.leftSize;
   let rightSize = config.rightSize || defaultConfig.rightSize;

From a73c653ca9ef26c634d26b44406b984db772be5e Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:25:06 -0500
Subject: [PATCH 044/132] Added border radius to custom tokens search

---
 source/views/Extension/Views/AddToken/styles.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/views/Extension/Views/AddToken/styles.js b/source/views/Extension/Views/AddToken/styles.js
index 28ec80a0..ccdfff33 100644
--- a/source/views/Extension/Views/AddToken/styles.js
+++ b/source/views/Extension/Views/AddToken/styles.js
@@ -16,6 +16,9 @@ export default makeStyles((theme) => ({
     height: 41,
     width: 41,
     marginRight: theme.spacing(1),
+    '& > img': {
+      borderRadius: '100%',
+    }
   },
   verified: {
     position: 'absolute',

From fe8eb0e1251a622e36441744ec1ad1c32f2694fb Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:32:32 -0500
Subject: [PATCH 045/132] reduced token decimal places

---
 source/components/AssetItem/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/components/AssetItem/index.jsx b/source/components/AssetItem/index.jsx
index 6315fbbe..22ce92a4 100644
--- a/source/components/AssetItem/index.jsx
+++ b/source/components/AssetItem/index.jsx
@@ -111,7 +111,7 @@ const AssetItem = ({
                     <NumberFormat
                       value={amount}
                       displayType="text"
-                      decimalScale={5}
+                      decimalScale={3}
                       fixedDecimalScale
                       thousandSeparator=","
                       suffix={` ${symbol}`}

From 91a70837758071c1afcd50f6ce50e29e3ac63250 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:33:06 -0500
Subject: [PATCH 046/132] Reduced font weight of text in banner

---
 source/components/ConnectionStatus/styles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/components/ConnectionStatus/styles.js b/source/components/ConnectionStatus/styles.js
index 384acb8a..2605a1c8 100644
--- a/source/components/ConnectionStatus/styles.js
+++ b/source/components/ConnectionStatus/styles.js
@@ -20,7 +20,7 @@ export default makeStyles((theme) => ({
   },
   fullWidth,
   bannerText: {
-    fontWeight: 'bold',
+    fontWeight: '600',
   },
   active: {
     background: theme.palette.success.main,

From edfb738659381bc58b9adad1924c5fb3483a5c34 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:35:42 -0500
Subject: [PATCH 047/132] Added border raduis to second step of addToken

---
 source/views/Extension/Views/AddToken/styles.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/views/Extension/Views/AddToken/styles.js b/source/views/Extension/Views/AddToken/styles.js
index ccdfff33..24718c26 100644
--- a/source/views/Extension/Views/AddToken/styles.js
+++ b/source/views/Extension/Views/AddToken/styles.js
@@ -16,6 +16,7 @@ export default makeStyles((theme) => ({
     height: 41,
     width: 41,
     marginRight: theme.spacing(1),
+    borderRadius: '100%',
     '& > img': {
       borderRadius: '100%',
     }

From 1d3c2a036deb9cba5ff6883883c291e91a027fec Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:36:41 -0500
Subject: [PATCH 048/132] Updated yarn.lock

---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 76b9d77c..227194ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1793,10 +1793,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.19.10":
-  version "0.19.10"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.10/a68fd3461d0d88a27e62321c5ba0963203f60ac9#a68fd3461d0d88a27e62321c5ba0963203f60ac9"
-  integrity sha512-EUiChzWlSqTNQRDmiy+2YRdnEfgc2zEpWxBxm284wa0yZhAO1hp3jZE3NauO/HkfL/ahiZeQbJ6q07uvNYlxmA==
+"@psychedelic/plug-controller@0.19.11":
+  version "0.19.11"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.11/05425f4e465a390d00056b11033e7a5d24cdc57c#05425f4e465a390d00056b11033e7a5d24cdc57c"
+  integrity sha512-xyDt0L/fm0R7xryf/e/pVcR4+gJM4BoWneazuo0OcHxFhy/0LRh4ml/x0KOP0KgHMS+l6OBDyiARkqPqiIHrfw==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -13249,4 +13249,4 @@ zip-stream@^4.1.0:
   dependencies:
     archiver-utils "^2.1.0"
     compress-commons "^4.1.0"
-    readable-stream "^3.6.0"
\ No newline at end of file
+    readable-stream "^3.6.0"

From 64dd83eba5492d01e492e62c64d84f41d3dff236 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 22 Sep 2022 11:28:06 -0500
Subject: [PATCH 049/132] Added utils for icns address

---
 source/shared/utils/icns.js          | 5 +++++
 source/shared/utils/short-address.js | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 source/shared/utils/icns.js

diff --git a/source/shared/utils/icns.js b/source/shared/utils/icns.js
new file mode 100644
index 00000000..dbe97349
--- /dev/null
+++ b/source/shared/utils/icns.js
@@ -0,0 +1,5 @@
+const ICNS_SUFFIX = '.icp';
+
+const isICNSAddress = (address) => address.substr(address.length - 4) === ICNS_SUFFIX;
+
+export default isICNSAddress;
diff --git a/source/shared/utils/short-address.js b/source/shared/utils/short-address.js
index 8bc96514..17118bf6 100644
--- a/source/shared/utils/short-address.js
+++ b/source/shared/utils/short-address.js
@@ -1,4 +1,5 @@
 import { validateAccountId } from './ids';
+import isICNSAddress from './icns';
 
 const defaultConfig = {
   leftSize: 5,
@@ -10,7 +11,7 @@ const defaultConfig = {
 const shortAddress = (address, config = defaultConfig) => {
   if (!address) return '';
   if (typeof address !== 'string') return '';
-  if (address.substr(address.length - 4) == '.icp') return address;
+  if (isICNSAddress(address)) return address;
 
   let leftSize = config.leftSize || defaultConfig.leftSize;
   let rightSize = config.rightSize || defaultConfig.rightSize;

From f55defacbb8c53425cf2a5ccdcc2952edf969e04 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Thu, 22 Sep 2022 16:59:24 -0300
Subject: [PATCH 050/132] modified getAssetFee function - removed fixed fee
 values - now can send max amount of any tokens

---
 package.json                         |  2 +-
 source/shared/constants/addresses.js | 15 ++++++---------
 yarn.lock                            | 28 ++++++++++++++--------------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index f172613f..c5ed52f3 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.11",
+    "@psychedelic/plug-controller": "0.20.3",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/shared/constants/addresses.js b/source/shared/constants/addresses.js
index 8d968525..62e6da21 100644
--- a/source/shared/constants/addresses.js
+++ b/source/shared/constants/addresses.js
@@ -11,13 +11,10 @@ export const ADDRESS_TYPES = {
   ICNS: 'icns',
 };
 
-export const DEFAULT_ICP_FEE = 0.0001;
-export const XTC_FEE = 0.002;
-export const OGY_FEE = 0.002;
+export const getAssetFee = (selectedAsset) => {
+  const { fee, decimals } = selectedAsset;
 
-// TODO: Serialize fee and decimals in assets and remove this.
-export const getAssetFee = (asset) => ({
-  ICP: DEFAULT_ICP_FEE,
-  XTC: XTC_FEE,
-  OGY: OGY_FEE,
-}[asset?.symbol] || 0.0);
+  const parsedFee = fee / 10 ** decimals;
+
+  return parsedFee;
+};
diff --git a/yarn.lock b/yarn.lock
index 76b9d77c..74c8d404 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1765,10 +1765,10 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js@1.4.5":
-  version "1.4.5"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.5/eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f#eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f"
-  integrity sha512-UQ2SGF+1YOGjZPWp0BeA+hR90PyVBHlRoJMVhERu9w49PcNEYR+Sf+Toa0MwGpZfwAT5rSQYbSkKBqQnWjHzHA==
+"@psychedelic/dab-js@1.4.10":
+  version "1.4.10"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.10/ab2728aa672012b6889bbfc2730e63149517e965#ab2728aa672012b6889bbfc2730e63149517e965"
+  integrity sha512-OBVif7y1qAk4ZPeB7bEeQGbDgUuNpwndGU86N8dNsoAmrgrHpNb47DGHnH9Rs6KG7fPMBnNed15BUBzCRVKR2Q==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1779,10 +1779,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/dab-js@1.4.6":
-  version "1.4.6"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.6/8c06156d4c51634e2a35a837e3b89d18f246ce0e#8c06156d4c51634e2a35a837e3b89d18f246ce0e"
-  integrity sha512-p5MhoUikpqb+osqjg4dthiKFYt9X4EMKPOBbe6OD20iOxvmTIqQ3dqejwXSJO28ohFCnZseRG+UQsfoz+6jhTw==
+"@psychedelic/dab-js@1.4.5":
+  version "1.4.5"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.5/eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f#eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f"
+  integrity sha512-UQ2SGF+1YOGjZPWp0BeA+hR90PyVBHlRoJMVhERu9w49PcNEYR+Sf+Toa0MwGpZfwAT5rSQYbSkKBqQnWjHzHA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1793,17 +1793,17 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.19.10":
-  version "0.19.10"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.10/a68fd3461d0d88a27e62321c5ba0963203f60ac9#a68fd3461d0d88a27e62321c5ba0963203f60ac9"
-  integrity sha512-EUiChzWlSqTNQRDmiy+2YRdnEfgc2zEpWxBxm284wa0yZhAO1hp3jZE3NauO/HkfL/ahiZeQbJ6q07uvNYlxmA==
+"@psychedelic/plug-controller@0.20.3":
+  version "0.20.3"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.20.3/15c02d57cc565288af5bda4ca001b10e622b2546#15c02d57cc565288af5bda4ca001b10e622b2546"
+  integrity sha512-nBB3Ah3oPbWJ7tsLzkGDcFAM3miv5CeYlMQ1migkdwMf1LliEswCh9KYPhQYRbjiB4PVqOfREtdXz35hXmQp5g==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.6"
+    "@psychedelic/dab-js" "1.4.10"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"
@@ -13249,4 +13249,4 @@ zip-stream@^4.1.0:
   dependencies:
     archiver-utils "^2.1.0"
     compress-commons "^4.1.0"
-    readable-stream "^3.6.0"
\ No newline at end of file
+    readable-stream "^3.6.0"

From b5cba4e56bcb398c08534f718101e6b172025073 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Thu, 22 Sep 2022 17:26:29 -0300
Subject: [PATCH 051/132] added fallback if fee and decimal doenst exist

---
 source/shared/constants/addresses.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/shared/constants/addresses.js b/source/shared/constants/addresses.js
index 62e6da21..0f55b57e 100644
--- a/source/shared/constants/addresses.js
+++ b/source/shared/constants/addresses.js
@@ -14,7 +14,7 @@ export const ADDRESS_TYPES = {
 export const getAssetFee = (selectedAsset) => {
   const { fee, decimals } = selectedAsset;
 
-  const parsedFee = fee / 10 ** decimals;
+  const parsedFee = fee && decimals ? fee / 10 ** decimals : 0;
 
   return parsedFee;
 };

From 1a426e3bce9cc3da088185fbda71743f1d45e75e Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Thu, 22 Sep 2022 16:04:05 -0600
Subject: [PATCH 052/132] Serialize host into metadata and pass it into regular
 connection requests

---
 source/Modules/Controller/connection.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/Modules/Controller/connection.js b/source/Modules/Controller/connection.js
index 1d2817f2..9e58a5a5 100644
--- a/source/Modules/Controller/connection.js
+++ b/source/Modules/Controller/connection.js
@@ -124,6 +124,7 @@ export class ConnectionModule extends ControllerModuleBase {
         const { id: callId } = message.data.data;
         const { id: portId } = sender;
         const { url: domainUrl, icons } = metadata;
+        const newMetadata = { ...metadata, host };
 
         if (isValidWhitelist) {
           canistersInfo = await fetchCanistersInfo(whitelist);
@@ -137,8 +138,6 @@ export class ConnectionModule extends ControllerModuleBase {
 
         // If we receive a whitelist, we open the allow agent modal
         if (isValidWhitelist) {
-          const newMetadata = { ...metadata, requestConnect: true };
-
           const fixedHeight = this.keyring?.isUnlocked
             ? Math.min(422 + 65 * whitelist.length, 550)
             : SIZES.loginHeight;
@@ -170,6 +169,7 @@ export class ConnectionModule extends ControllerModuleBase {
             argsJson: JSON.stringify({ timeout, transactionId }),
             type: 'connect',
             domainUrl,
+            metadataJson: JSON.stringify(newMetadata),
           }, callback);
         }
       },

From 733543ea7dcae82d71006dfe95c7088f5f7c47c3 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Fri, 23 Sep 2022 12:26:48 -0500
Subject: [PATCH 053/132] Controller version bump

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

diff --git a/package.json b/package.json
index f172613f..bbc856b7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.11",
+    "@psychedelic/plug-controller": "0.21.0",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 76b9d77c..3a5a9607 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1765,10 +1765,10 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js@1.4.5":
-  version "1.4.5"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.5/eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f#eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f"
-  integrity sha512-UQ2SGF+1YOGjZPWp0BeA+hR90PyVBHlRoJMVhERu9w49PcNEYR+Sf+Toa0MwGpZfwAT5rSQYbSkKBqQnWjHzHA==
+"@psychedelic/dab-js@1.4.10":
+  version "1.4.10"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.10/ab2728aa672012b6889bbfc2730e63149517e965#ab2728aa672012b6889bbfc2730e63149517e965"
+  integrity sha512-OBVif7y1qAk4ZPeB7bEeQGbDgUuNpwndGU86N8dNsoAmrgrHpNb47DGHnH9Rs6KG7fPMBnNed15BUBzCRVKR2Q==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1779,10 +1779,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/dab-js@1.4.6":
-  version "1.4.6"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.6/8c06156d4c51634e2a35a837e3b89d18f246ce0e#8c06156d4c51634e2a35a837e3b89d18f246ce0e"
-  integrity sha512-p5MhoUikpqb+osqjg4dthiKFYt9X4EMKPOBbe6OD20iOxvmTIqQ3dqejwXSJO28ohFCnZseRG+UQsfoz+6jhTw==
+"@psychedelic/dab-js@1.4.5":
+  version "1.4.5"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.5/eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f#eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f"
+  integrity sha512-UQ2SGF+1YOGjZPWp0BeA+hR90PyVBHlRoJMVhERu9w49PcNEYR+Sf+Toa0MwGpZfwAT5rSQYbSkKBqQnWjHzHA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1793,17 +1793,17 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.19.10":
-  version "0.19.10"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.19.10/a68fd3461d0d88a27e62321c5ba0963203f60ac9#a68fd3461d0d88a27e62321c5ba0963203f60ac9"
-  integrity sha512-EUiChzWlSqTNQRDmiy+2YRdnEfgc2zEpWxBxm284wa0yZhAO1hp3jZE3NauO/HkfL/ahiZeQbJ6q07uvNYlxmA==
+"@psychedelic/plug-controller@0.21.0":
+  version "0.21.0"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.0/48e547f647bcbd1723cd4536688bf07811b15ee7#48e547f647bcbd1723cd4536688bf07811b15ee7"
+  integrity sha512-L/Jkrl7tjIosZth1IKj5d0m+pTbsB+y1LgFRpI1LJsXEoWbgzEjwsesgeN5BvNNbqW+SMPTPcUusk+Fug6WaFA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.6"
+    "@psychedelic/dab-js" "1.4.10"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"
@@ -13249,4 +13249,4 @@ zip-stream@^4.1.0:
   dependencies:
     archiver-utils "^2.1.0"
     compress-commons "^4.1.0"
-    readable-stream "^3.6.0"
\ No newline at end of file
+    readable-stream "^3.6.0"

From 068c486ef2b1880748a285bda5c5cb822292bfb7 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Fri, 23 Sep 2022 12:27:19 -0500
Subject: [PATCH 054/132] Fixed switch account ICNS bug

---
 .../views/Extension/Views/WalletDetails/index.jsx | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 6c55d8a9..9b9e53ec 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -256,12 +256,6 @@ const WalletDetails = () => {
           dispatch(setICNSData(newWallet.icnsData));
           dispatch(setAssetsLoading(true));
           dispatch(setTransactions([]));
-          sendMessage({
-            type: HANDLER_TYPES.GET_ICNS_DATA,
-            params: { refresh: true },
-          }, (icnsData) => {
-            dispatch(setICNSData(icnsData));
-          });
           sendMessage({
             type: HANDLER_TYPES.GET_ASSETS,
             params: { refresh: true },
@@ -287,15 +281,6 @@ const WalletDetails = () => {
     });
   }, []);
 
-  useEffect(() => {
-    sendMessage({
-      type: HANDLER_TYPES.GET_ICNS_DATA,
-      params: { refresh: true },
-    }, (icnsData) => {
-      dispatch(setICNSData(icnsData));
-    });
-  }, []);
-
   useEffect(() => {
     setWalletName(editAccount.name);
     setCurrentEmoji(editAccount.icon);

From 8c874fd01f3900e6b62d908da44912d5f2b68b93 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Fri, 23 Sep 2022 13:09:14 -0500
Subject: [PATCH 055/132] Added account icon constant

---
 source/shared/constants/account.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 source/shared/constants/account.js

diff --git a/source/shared/constants/account.js b/source/shared/constants/account.js
new file mode 100644
index 00000000..eb531d71
--- /dev/null
+++ b/source/shared/constants/account.js
@@ -0,0 +1 @@
+export const ACCOUNT_ICON = '👽';

From c241eb660b09df744fed9ab5338fdfc1bb9c41f9 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Fri, 23 Sep 2022 13:09:37 -0500
Subject: [PATCH 056/132] replaced user icon with constant

---
 source/redux/wallet.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/redux/wallet.js b/source/redux/wallet.js
index 5a39df38..8b9818f4 100644
--- a/source/redux/wallet.js
+++ b/source/redux/wallet.js
@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { ACTIVITY_STATUS } from '@shared/constants/activity';
+import { ACCOUNT_ICON } from '@shared/constants/account';
 import {
   formatAssetBySymbol,
   formatAssets,
@@ -22,7 +23,7 @@ export const walletSlice = createSlice({
     name: 'Account 1',
     principalId: '',
     accountId: '',
-    emoji: '👽',
+    emoji: ACCOUNT_ICON,
     transactions: [],
     assets: Object.values(TOKENS),
     walletId: '',

From 1abcdc8e70f60638a18de8e2a2c4b004f417241a Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Fri, 23 Sep 2022 13:10:28 -0500
Subject: [PATCH 057/132] Fixed switch account & account default icon

---
 source/views/Extension/Views/WalletDetails/index.jsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 9b9e53ec..34411ff0 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -10,6 +10,7 @@ import extensionizer from 'extensionizer';
 
 import { getWalletsConnectedToUrl, getApp, getUseICNS } from '@modules/storageManager';
 import { getTabURL } from '@shared/utils/chrome-tabs';
+import { ACCOUNT_ICON } from '@shared/constants/account';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import {
   setAccountInfo,
@@ -283,7 +284,7 @@ const WalletDetails = () => {
 
   useEffect(() => {
     setWalletName(editAccount.name);
-    setCurrentEmoji(editAccount.icon);
+    setCurrentEmoji(editAccount.icon || ACCOUNT_ICON);
   }, [editAccount]);
 
   useEffect(() => {
@@ -362,14 +363,14 @@ const WalletDetails = () => {
                   </button>
                 )}
                 {
-                  !useICNS && (<button
+                  <button
                     type="button"
                     onClick={openEditWalletName}
                   >
                     <img
                       src={Pencil}
                     />
-                  </button>)
+                  </button>
                 }
               </div>
             )}

From 3a67e848a90a55ea2ace7e201f0a642f9b9e80fa Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Fri, 23 Sep 2022 15:08:27 -0600
Subject: [PATCH 058/132] Updated dab-js and added fee as a parameter in the
 send operation

---
 package.json         | 2 +-
 source/redux/send.js | 8 +++++---
 yarn.lock            | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index c5ed52f3..060fc13e 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@material-ui/icons": "^4.11.2",
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
-    "@psychedelic/dab-js": "1.4.5",
+    "@psychedelic/dab-js": "1.4.11",
     "@psychedelic/plug-controller": "0.20.3",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
diff --git a/source/redux/send.js b/source/redux/send.js
index 750195ed..35b586fe 100644
--- a/source/redux/send.js
+++ b/source/redux/send.js
@@ -78,11 +78,13 @@ export const sendToken = createAsyncThunk(
     const to = addressInfo.resolvedAddress || address;
     const amount = rawAmount.toString();
 
-    const { canisterId, standard, decimals } = selectedAsset || {};
-
+    const {
+      canisterId, standard, decimals, fee = 0,
+    } = selectedAsset || {};
+    const opts = { fee };
     try {
       const res = await callSendToken({
-        to, amount, canisterId, standard, decimals,
+        to, amount, canisterId, standard, decimals, opts,
       });
       return res;
     } catch ({ error }) {
diff --git a/yarn.lock b/yarn.lock
index 74c8d404..e9b0a984 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1779,10 +1779,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/dab-js@1.4.5":
-  version "1.4.5"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.5/eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f#eccee7c10979dcf0c55ab0bc7f02e863a4a8b54f"
-  integrity sha512-UQ2SGF+1YOGjZPWp0BeA+hR90PyVBHlRoJMVhERu9w49PcNEYR+Sf+Toa0MwGpZfwAT5rSQYbSkKBqQnWjHzHA==
+"@psychedelic/dab-js@1.4.11":
+  version "1.4.11"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.11/e6800b2304edc64299407ec32f5749b1f30ec60b#e6800b2304edc64299407ec32f5749b1f30ec60b"
+  integrity sha512-lWNRBSbJCjDKOG+xNwcL809TUguoJM8jGhPlxhIBwoy5u2RZrMcMQ7DmlpKkUsXqi5VGEiP25Ud23pPPjejc+w==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 6c24ae70deaaa5afaaf580b1ec87a8d4f0551801 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Sun, 25 Sep 2022 17:38:59 -0300
Subject: [PATCH 059/132] component created for Drag and drop functionality -
 setState passed through props

---
 .../Views/ImportWallet/Steps/Step1.jsx        | 120 ++---------------
 .../ImportWallet/components/DragDropBox.jsx   | 124 ++++++++++++++++++
 .../Extension/Views/ImportWallet/styles.js    |  11 ++
 3 files changed, 146 insertions(+), 109 deletions(-)
 create mode 100644 source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index e7a9ec29..615eb6ca 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -1,128 +1,30 @@
-import { Container, Button, Alert } from '@components'
-import { Typography } from '@material-ui/core';
+import { Container, Button } from '@components'
 import Grid from '@material-ui/core/Grid';
-import React, { useRef, useState } from 'react'
-import useStyles from '../styles';
-import { CloudUpload } from '@material-ui/icons';
-import CloseIcon from '@material-ui/icons/Close';
-import { useEffect } from 'react';
-import GradientFile from '@assets/icons/gradient-file.svg';
+import React, { useState } from 'react'
+import DragDropBox from '../components/DragDropBox';
 
 const Step1 = () => {
   const [loading, setLoading] = useState(false);
-  const [dragActive, setDragActive] = useState(false);
-  const [fileNotSupported, setFileNotSupported] = useState(false);
-  const [pemFile, setPemFile] = useState(null);
-
+  const [disabled, setDisabled] = useState(false);
   const ACCEPTED_FILE_EXT = 'pem';
 
-  const classes = useStyles();
-
-  const inputRef = useRef(null);
-
-  const checkPemFile = (fileObject) => {
-    const fileExt = fileObject[0]?.name.split('.').pop();
-    if (fileExt === ACCEPTED_FILE_EXT) {
-      console.log('extension correcta', fileExt);
-      console.log('file extension', fileObject[0]);
-      setPemFile(fileObject[0]);
-    } else {
-      setFileNotSupported(true);
-      console.log('extension incorrecta', fileExt);
-    }
-  }
-
-  const handleDrag = (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    if (e.type === "dragenter" || e.type === "dragover") {
-      setDragActive(true);
-    } else if (e.type === "dragleave") {
-      setDragActive(false);
-    }
-  }
-
-  const handleDrop = (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    setDragActive(false);
-    if (e.dataTransfer.files && e.dataTransfer.files[0]) {
-      checkPemFile(e.dataTransfer.files);
-    }
-  };
-
-  const handleRemoveFile = () => {
-    setPemFile(null);
-  }
-
-  const handleChange = (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    if (e.target.files && e.target.files[0]) {
-      checkPemFile(e.target.files);
-    }
-  }
-
-  useEffect(() => {
-    if (fileNotSupported) {
-      setTimeout(() => {
-        console.log('arranca setTimeOut');
-        setFileNotSupported(false);
-      }, 2000)
-    }
-  }, [fileNotSupported]);
-
   return (
     <Container>
       <Grid container spacing={2}>
         <Grid item xs={12}>
-          <div className={fileNotSupported ? classes.dragDropContainerError : classes.dragDropContainer}>
-            <form
-              onDragEnter={handleDrag}
-              onDragLeave={handleDrag}
-              onDragOver={handleDrag}
-              onDrop={handleDrop}
-              onSubmit={(e) => e.preventDefault()}
-              className={classes.insideDragDrop}
-            >
-              {
-                pemFile ? (
-                  <>
-                    <img src={GradientFile} alt="gradientFile" />
-                    <div className={classes.nameXIcon}>
-                      <Typography variant='h5'>
-                        {pemFile.name || ''}
-                      </Typography>
-                      <CloseIcon className={classes.icon} onClick={() => handleRemoveFile()} />
-                    </div>
-                  </>
-                ) : (
-                  <>
-                    <CloudUpload fontSize='large' />
-                    <Typography className={classes.dragDropText} variant='h6'>
-                      Drag and Drop <br />
-                      or <a className={classes.dragDropBrowse} href="">browse</a>
-                    </Typography>
-                  </>
-                )
-              }
-            </form>
-          </div>
-          {
-            fileNotSupported && (
-              <span className={classes.error}>
-                File not supported. Try a different file.
-              </span>
-            )
-          }
+          <DragDropBox
+            acceptedExtension={ACCEPTED_FILE_EXT}
+            setLoading={setLoading}
+            setDisabled={setDisabled}
+          />
         </Grid>
         <Grid item xs={12}>
           <Button
             variant="rainbow"
             value="Continue"
-            onClick={() => console.log('Hola como estas')}
+            onClick={() => console.log('Continueee')}
             loading={loading}
-            disabled={!loading}
+            disabled={!disabled}
             fullWidth
             data-testid="add-button"
           />
diff --git a/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx b/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
new file mode 100644
index 00000000..c62ec56c
--- /dev/null
+++ b/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
@@ -0,0 +1,124 @@
+import React, { useState } from 'react'
+import useStyles from '../styles';
+import { CloudUpload } from '@material-ui/icons';
+import CloseIcon from '@material-ui/icons/Close';
+import { useEffect } from 'react';
+import GradientFile from '@assets/icons/gradient-file.svg';
+import { Typography } from '@material-ui/core';
+
+const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
+  const classes = useStyles();
+
+  const [dragActive, setDragActive] = useState(false);
+  const [fileNotSupported, setFileNotSupported] = useState(false);
+  const [file, setFile] = useState(null);
+
+  const handleRemoveFile = () => {
+    setFile(null);
+    setDisabled(false);
+  }
+ 
+  useEffect(() => {
+    if (fileNotSupported) {
+      setTimeout(() => {
+        console.log('arranca setTimeOut');
+        setFileNotSupported(false);
+      }, 2000)
+    }
+  }, [fileNotSupported]);
+
+
+  const checkDesiredFile = (fileObject) => {
+    setLoading(true); 
+    setLoading(false);
+    const fileExt = fileObject[0]?.name.split('.').pop();
+    if (fileExt === acceptedExtension) {
+      console.log('extension correcta', fileExt);
+      console.log('file extension', fileObject[0]);
+      setFile(fileObject[0]);
+      setLoading(false);
+      setDisabled(true);
+    } else {
+      setFileNotSupported(true);
+      console.log('extension incorrecta', fileExt);
+    }
+  }
+
+  const handleDrag = (e) => {
+    console.log('entra en el handle Drag');
+    e.preventDefault();
+    e.stopPropagation();
+    if (e.type === "dragenter" || e.type === "dragover") {
+      setDragActive(true);
+    } else if (e.type === "dragleave") {
+      setDragActive(false);
+    }
+  }
+
+  const handleDrop = (e) => {
+    console.log('entra en el handle Drop');
+    e.preventDefault();
+    e.stopPropagation();
+    setDragActive(false);
+    if (e.dataTransfer.files && e.dataTransfer.files[0]) {
+      checkDesiredFile(e.dataTransfer.files);
+    }
+  };
+
+  const handleChange = (e) => {
+    console.log('entra en el handleChange');
+    e.preventDefault();
+    e.stopPropagation();
+    if (e.target.files && e.target.files[0]) {
+      checkDesiredFile(e.target.files);
+    }
+  }
+
+
+  return (
+    <>
+      <div className={fileNotSupported ? classes.dragDropContainerError : classes.dragDropContainer}>
+        <form
+          onDragEnter={handleDrag}
+          onDragLeave={handleDrag}
+          onDragOver={handleDrag}
+          onDrop={handleDrop}
+          onSubmit={(e) => e.preventDefault()}
+          className={classes.insideDragDrop}
+        >
+          <input type="file" id='input-file-upload' className={classes.inputFile} multiple={true} onChange={handleChange} />
+          {
+            file ? (
+              <>
+                <img src={GradientFile} alt="gradientFile" />
+                <div className={classes.nameXIcon}>
+                  <Typography variant='h5'>
+                    {file.name || ''}
+                  </Typography>
+                  <CloseIcon className={classes.icon} onClick={() => handleRemoveFile()} />
+                </div>
+              </>
+            ) : (
+              <>
+                <CloudUpload style={{ color: '#BBBEC2' }} fontSize='large' />
+                <Typography className={classes.dragDropText} variant='h6'>
+                  Drag and Drop <br />
+                  or <label className={classes.inputFileLabel} id="label-file-upload" htmlFor="input-file-upload">browse</label>
+                </Typography>
+              </>
+            )
+          }
+        </form>
+      </div>
+      {
+        fileNotSupported && (
+          <span className={classes.error}>
+            File not supported. Try a different file.
+          </span>
+        )
+      }
+    </>
+  )
+}
+
+export default DragDropBox
\ No newline at end of file
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 1fdb84e7..2bd00031 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -24,6 +24,17 @@ export default makeStyles((theme) => ({
     flexDirection: 'column',
     height: '100%',
   },
+  inputFile: {
+    display: 'none',
+  },
+  inputFileLabel: {
+    textDecorationLine: 'underline',
+    textDecorationColor: '#3574F4',
+    color: '#3574F4',
+    '&:hover': {  
+      cursor: 'pointer',
+    }
+  },
   nameXIcon: {
     display: 'flex',
     justifyContent: 'center',

From b3d291f450fa4d0c74e8e70e94400f340b62e2a3 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 26 Sep 2022 02:38:46 -0300
Subject: [PATCH 060/132] added red warning icon - added step2

---
 source/assets/icons/red-warning-icon.svg      |  3 +
 .../Views/ImportWallet/Steps/Step2.jsx        | 82 +++++++++++++++++++
 .../ImportWallet/components/DragDropBox.jsx   |  9 +-
 .../Views/ImportWallet/hooks/useSteps.jsx     | 17 ++--
 .../Extension/Views/ImportWallet/styles.js    | 23 +++++-
 5 files changed, 118 insertions(+), 16 deletions(-)
 create mode 100644 source/assets/icons/red-warning-icon.svg
 create mode 100644 source/views/Extension/Views/ImportWallet/Steps/Step2.jsx

diff --git a/source/assets/icons/red-warning-icon.svg b/source/assets/icons/red-warning-icon.svg
new file mode 100644
index 00000000..a1657145
--- /dev/null
+++ b/source/assets/icons/red-warning-icon.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.25706 1.09858C7.02167 -0.260724 8.97875 -0.260725 9.74336 1.09858L15.3237 11.0191C16.0736 12.3523 15.1102 13.9996 13.5805 13.9996H2.4199C0.890251 13.9996 -0.0731769 12.3523 0.676753 11.0191L6.25706 1.09858ZM9.00012 10.9998C9.00012 11.552 8.55241 11.9998 8.00012 11.9998C7.44784 11.9998 7.00012 11.552 7.00012 10.9998C7.00012 10.4475 7.44784 9.99976 8.00012 9.99976C8.55241 9.99976 9.00012 10.4475 9.00012 10.9998ZM8.00012 2.99976C7.44784 2.99976 7.00012 3.44747 7.00012 3.99976V6.99976C7.00012 7.55204 7.44784 7.99976 8.00012 7.99976C8.55241 7.99976 9.00012 7.55204 9.00012 6.99976V3.99976C9.00012 3.44747 8.55241 2.99976 8.00012 2.99976Z" fill="#E53C3C"/>
+</svg>
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
new file mode 100644
index 00000000..4d59fe96
--- /dev/null
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -0,0 +1,82 @@
+import { Container, Button, TextInput, FormItem, UserIcon } from '@components'
+import Grid from '@material-ui/core/Grid';
+import useStyles from '../styles';
+import React, { useState } from 'react'
+import Picker from 'emoji-picker-react';
+
+const Step2 = () => {
+  const [loading, setLoading] = useState(false);
+  const [disabled, setDisabled] = useState(false);
+  const [openEmojis, setOpenEmojis] = useState(false);
+  const [walletName, setWalletName] = useState(''); // add deafault wallet name, for example the next wallet not used number
+  const [currentEmoji, setCurrentEmoji] = useState('😎'); // add default emoji, not used in other wallets
+  const [openEmojiSelector, setOpenEmojiSelector] = useState(false);
+
+  const classes = useStyles();
+
+  const onEmojiClick = (_event, emojiObject) => {
+    setCurrentEmoji(emojiObject.emoji);
+    setOpenEmojis(false);
+    setOpenEmojiSelector(false);
+  };
+
+  return (
+    <Container>
+      <Grid container spacing={2}>
+        <div className={classes.chooseEmojiContainer}>
+          <UserIcon icon={currentEmoji} size='big' />
+          <Button
+            variant="primary"
+            value={'Edit Wallet Pic'}
+            onClick={() => setOpenEmojiSelector(!openEmojiSelector)}
+            style={{
+              minWidth: 115,
+              height: 24,
+              borderRadius: 6,
+            }}
+          />
+          {
+            openEmojiSelector && (
+              <Picker
+                pickerStyle={{
+                }}
+                onEmojiClick={onEmojiClick}
+                native
+                groupVisibility={{
+                  recently_used: false,
+                  flags: false,
+                }}
+              />
+            )
+          }
+        </div>
+        <FormItem
+          smallLabel
+          label={'Name'}
+          component={(
+            <TextInput
+              fullWidth
+              // value={}
+              onChange={e => setWalletName(e.target.value)}
+              type="text"
+            // error={}
+            />
+          )}
+        />
+        <Grid item xs={12}>
+          <Button
+            variant="rainbow"
+            value="Save"
+            onClick={() => console.log('Continueee')}
+            loading={loading}
+            disabled={!disabled}
+            fullWidth
+            data-testid="add-button"
+          />
+        </Grid>
+      </Grid>
+    </Container>
+  )
+}
+
+export default Step2
diff --git a/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx b/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
index c62ec56c..008152c8 100644
--- a/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
+++ b/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
@@ -5,6 +5,7 @@ import CloseIcon from '@material-ui/icons/Close';
 import { useEffect } from 'react';
 import GradientFile from '@assets/icons/gradient-file.svg';
 import { Typography } from '@material-ui/core';
+import RedWarningIcon from '@assets/icons/red-warning-icon.svg';
 
 const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
   const classes = useStyles();
@@ -27,7 +28,7 @@ const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
     }
   }, [fileNotSupported]);
 
-
+  // could be a good feature for the future accept more than one extension
   const checkDesiredFile = (fileObject) => {
     setLoading(true); 
     setLoading(false);
@@ -109,14 +110,14 @@ const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
             )
           }
         </form>
-      </div>
-      {
+        {
         fileNotSupported && (
           <span className={classes.error}>
-            File not supported. Try a different file.
+            <img src={RedWarningIcon} alt="" /> File not supported. Try a different file.
           </span>
         )
       }
+      </div>
     </>
   )
 }
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index 452804ab..4314c070 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useRouter } from '@components/Router';
 import BackIcon from '@assets/icons/back.svg';
 import Step1 from '../Steps/Step1';
-
+import Step2 from '../Steps/Step2';
 
 const useSteps = () => {
   const [step, setStep] = useState(0);
@@ -18,20 +18,19 @@ const useSteps = () => {
   const rightButton = <LinkButton value={t('common.close')} onClick={handleClose} />;
 
   const steps = [
+    {
+      component: <Step2
+        handleClose={handleClose}
+      />,
+      right: rightButton,
+      center: 'Wallet Details',
+    },
     {
       component: <Step1 />,
       left: leftButton(() => handleClose()),
       right: rightButton,
       center: 'Import PEM file',
     },
-    // {
-    //   component: <Step2
-    //     handleClose={handleClose}
-    //   />,
-    //   left: leftButton(() => handleChangeStep(0)),
-    //   right: rightButton,
-    //   center: 'Import PEM file',
-    // },
   ];
 
   return steps[step];
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 2bd00031..0b7f7df0 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -1,4 +1,5 @@
 import { makeStyles } from '@material-ui/core/styles';
+import zIndex from '@material-ui/core/styles/zIndex';
 
 export default makeStyles((theme) => ({
   dragDropContainer: {
@@ -7,7 +8,7 @@ export default makeStyles((theme) => ({
     height: '142px',
     width: '370px',
     borderRadius: 6,
-    marginBottom: 10,
+    marginBottom: 40,
   },
   dragDropContainerError: {
     border: '2px dashed #E53C3C',
@@ -15,7 +16,7 @@ export default makeStyles((theme) => ({
     height: '142px',
     width: '370px',
     borderRadius: 6,
-    marginBottom: 10,
+    marginBottom: 40,
   },
   insideDragDrop: {
     display: 'flex',
@@ -27,6 +28,19 @@ export default makeStyles((theme) => ({
   inputFile: {
     display: 'none',
   },
+  chooseEmojiContainer: {
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    flexDirection: 'column',
+    width: '100%',
+    gap: 14,
+    marginTop: 10,
+    marginBottom: 25,
+  },
+  label: {
+    width: 'auto',
+  },
   inputFileLabel: {
     textDecorationLine: 'underline',
     textDecorationColor: '#3574F4',
@@ -81,6 +95,9 @@ export default makeStyles((theme) => ({
   },
   error: {
     color: '#E53C3C',
-    fontSize: 14
+    fontSize: 14,
+    display: 'flex',
+    gap: 11,
+    marginTop: 15,
   }
 }));

From 53d5aab172c766d34446776c9292901928c09e80 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 26 Sep 2022 03:08:23 -0300
Subject: [PATCH 061/132] added name validation and some style changes

---
 .../Views/ImportWallet/Steps/Step2.jsx        | 93 +++++++++++--------
 .../Extension/Views/ImportWallet/styles.js    |  3 +
 2 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 4d59fe96..12100598 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -3,6 +3,7 @@ import Grid from '@material-ui/core/Grid';
 import useStyles from '../styles';
 import React, { useState } from 'react'
 import Picker from 'emoji-picker-react';
+import { useEffect } from 'react';
 
 const Step2 = () => {
   const [loading, setLoading] = useState(false);
@@ -20,50 +21,62 @@ const Step2 = () => {
     setOpenEmojiSelector(false);
   };
 
+  useEffect(() => {
+    if (walletName && walletName !== "") {
+      setDisabled(true);
+    } else {
+      setDisabled(false);
+    }
+  }, [currentEmoji, walletName]);
+
+
   return (
     <Container>
       <Grid container spacing={2}>
-        <div className={classes.chooseEmojiContainer}>
-          <UserIcon icon={currentEmoji} size='big' />
-          <Button
-            variant="primary"
-            value={'Edit Wallet Pic'}
-            onClick={() => setOpenEmojiSelector(!openEmojiSelector)}
-            style={{
-              minWidth: 115,
-              height: 24,
-              borderRadius: 6,
-            }}
-          />
-          {
-            openEmojiSelector && (
-              <Picker
-                pickerStyle={{
-                }}
-                onEmojiClick={onEmojiClick}
-                native
-                groupVisibility={{
-                  recently_used: false,
-                  flags: false,
-                }}
-              />
-            )
-          }
-        </div>
-        <FormItem
-          smallLabel
-          label={'Name'}
-          component={(
-            <TextInput
-              fullWidth
-              // value={}
-              onChange={e => setWalletName(e.target.value)}
-              type="text"
-            // error={}
-            />
-          )}
-        />
         <Grid item xs={12}>
+          <div className={classes.chooseEmojiContainer}>
+            <UserIcon icon={currentEmoji} size='big' />
+            <Button
+              variant="primary"
+              value={'Edit Wallet Pic'}
+              onClick={() => setOpenEmojiSelector(!openEmojiSelector)}
+              style={{
+                minWidth: 115,
+                height: 24,
+                borderRadius: 6,
+              }}
+            />
+            {
+              openEmojiSelector && (
+                <Picker
+                  pickerStyle={{
+                    position: 'absolute',
+                    zIndex: 500,
+                    top: 180,
+                  }}
+                  onEmojiClick={onEmojiClick}
+                  native
+                  groupVisibility={{
+                    recently_used: false,
+                    flags: false,
+                  }}
+                />
+              )
+            }
+          </div>
+          <FormItem
+            smallLabel
+            label={'Name'}
+            className={classes.formItem}
+            component={(
+              <TextInput
+                fullWidth
+                onChange={e => setWalletName(e.target.value)}
+                type="text"
+              // error={}
+              />
+            )}
+          />
           <Button
             variant="rainbow"
             value="Save"
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 0b7f7df0..1672f60f 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -41,6 +41,9 @@ export default makeStyles((theme) => ({
   label: {
     width: 'auto',
   },
+  formItem: {
+    marginBottom: 20,
+  },
   inputFileLabel: {
     textDecorationLine: 'underline',
     textDecorationColor: '#3574F4',

From 168cb55cf5b845f8270be91eab368bccefd41d28 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 26 Sep 2022 03:18:44 -0300
Subject: [PATCH 062/132] now steps works - needs to put string into
 translation.js

---
 .../Extension/Views/ImportWallet/Steps/Step1.jsx     |  4 ++--
 .../Extension/Views/ImportWallet/Steps/Step2.jsx     |  8 ++++++--
 .../Extension/Views/ImportWallet/hooks/useSteps.jsx  | 12 ++++++------
 source/views/Extension/Views/ImportWallet/styles.js  |  2 +-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 615eb6ca..0c4fc8a3 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -3,7 +3,7 @@ import Grid from '@material-ui/core/Grid';
 import React, { useState } from 'react'
 import DragDropBox from '../components/DragDropBox';
 
-const Step1 = () => {
+const Step1 = ({handleChangeStep}) => {
   const [loading, setLoading] = useState(false);
   const [disabled, setDisabled] = useState(false);
   const ACCEPTED_FILE_EXT = 'pem';
@@ -22,7 +22,7 @@ const Step1 = () => {
           <Button
             variant="rainbow"
             value="Continue"
-            onClick={() => console.log('Continueee')}
+            onClick={() => handleChangeStep(1)}
             loading={loading}
             disabled={!disabled}
             fullWidth
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 12100598..ab76f1b3 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -1,7 +1,8 @@
 import { Container, Button, TextInput, FormItem, UserIcon } from '@components'
 import Grid from '@material-ui/core/Grid';
 import useStyles from '../styles';
-import React, { useState } from 'react'
+import React, { useState } from 'react';
+import { useRouter } from '@components/Router';
 import Picker from 'emoji-picker-react';
 import { useEffect } from 'react';
 
@@ -13,6 +14,9 @@ const Step2 = () => {
   const [currentEmoji, setCurrentEmoji] = useState('😎'); // add default emoji, not used in other wallets
   const [openEmojiSelector, setOpenEmojiSelector] = useState(false);
 
+  const { navigator } = useRouter();
+  
+
   const classes = useStyles();
 
   const onEmojiClick = (_event, emojiObject) => {
@@ -80,7 +84,7 @@ const Step2 = () => {
           <Button
             variant="rainbow"
             value="Save"
-            onClick={() => console.log('Continueee')}
+            onClick={() => navigator.navigate('home')}
             loading={loading}
             disabled={!disabled}
             fullWidth
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index 4314c070..86b75d71 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -18,6 +18,12 @@ const useSteps = () => {
   const rightButton = <LinkButton value={t('common.close')} onClick={handleClose} />;
 
   const steps = [
+    {
+      component: <Step1 handleChangeStep={handleChangeStep} />,
+      left: leftButton(() => handleClose()),
+      right: rightButton,
+      center: 'Import PEM file',
+    },
     {
       component: <Step2
         handleClose={handleClose}
@@ -25,12 +31,6 @@ const useSteps = () => {
       right: rightButton,
       center: 'Wallet Details',
     },
-    {
-      component: <Step1 />,
-      left: leftButton(() => handleClose()),
-      right: rightButton,
-      center: 'Import PEM file',
-    },
   ];
 
   return steps[step];
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 1672f60f..9697e4b7 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -8,7 +8,7 @@ export default makeStyles((theme) => ({
     height: '142px',
     width: '370px',
     borderRadius: 6,
-    marginBottom: 40,
+    marginBottom: 20,
   },
   dragDropContainerError: {
     border: '2px dashed #E53C3C',

From c2a4096f01f3851595ca830763c2d622ee22cd35 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 26 Sep 2022 04:02:56 -0300
Subject: [PATCH 063/132] now steps works - needs to put string into
 translation.js

---
 source/locales/en/translation.json            | 10 +++++
 .../Views/ImportWallet/Steps/Step1.jsx        |  7 ++-
 .../Views/ImportWallet/Steps/Step2.jsx        |  9 ++--
 .../ImportWallet/components/DragDropBox.jsx   | 44 +++++++++++++------
 .../Views/ImportWallet/hooks/useSteps.jsx     |  4 +-
 .../Extension/Views/ImportWallet/styles.js    |  4 ++
 6 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/source/locales/en/translation.json b/source/locales/en/translation.json
index f5a5ad9f..6ffdbca8 100644
--- a/source/locales/en/translation.json
+++ b/source/locales/en/translation.json
@@ -396,6 +396,16 @@
     "dfxUse": "dfx identity use <identity name>",
     "selectAccount": "Select Account"
   },
+  "importPem": {
+    "importPEMfile": "Import PEM file",
+    "editWalletPic": "Edit Wallet Pic",
+    "walletDetails": "Wallet Details",
+    "dragAndDrop": "Drag and Drop",
+    "or": "or",
+    "browse": "browse",
+    "fileNotSupported": "File not supported. Try a different file.",
+    "dropIt": "Drop it!"
+  },
   "nfts": {
     "allNfts": "All NFTs",
     "expandNFT": "View",
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 0c4fc8a3..13f39fa2 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -2,11 +2,16 @@ import { Container, Button } from '@components'
 import Grid from '@material-ui/core/Grid';
 import React, { useState } from 'react'
 import DragDropBox from '../components/DragDropBox';
+import { useTranslation } from 'react-i18next';
 
 const Step1 = ({handleChangeStep}) => {
+  const { t } = useTranslation();
+
   const [loading, setLoading] = useState(false);
   const [disabled, setDisabled] = useState(false);
   const ACCEPTED_FILE_EXT = 'pem';
+  
+
 
   return (
     <Container>
@@ -21,7 +26,7 @@ const Step1 = ({handleChangeStep}) => {
         <Grid item xs={12}>
           <Button
             variant="rainbow"
-            value="Continue"
+            value={t('common.continue')}
             onClick={() => handleChangeStep(1)}
             loading={loading}
             disabled={!disabled}
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index ab76f1b3..8385d81b 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -5,8 +5,11 @@ import React, { useState } from 'react';
 import { useRouter } from '@components/Router';
 import Picker from 'emoji-picker-react';
 import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const Step2 = () => {
+  const { t } = useTranslation();
+
   const [loading, setLoading] = useState(false);
   const [disabled, setDisabled] = useState(false);
   const [openEmojis, setOpenEmojis] = useState(false);
@@ -42,7 +45,7 @@ const Step2 = () => {
             <UserIcon icon={currentEmoji} size='big' />
             <Button
               variant="primary"
-              value={'Edit Wallet Pic'}
+              value={t("importPem.editWalletPic")}
               onClick={() => setOpenEmojiSelector(!openEmojiSelector)}
               style={{
                 minWidth: 115,
@@ -70,7 +73,7 @@ const Step2 = () => {
           </div>
           <FormItem
             smallLabel
-            label={'Name'}
+            label={t('common.name')}
             className={classes.formItem}
             component={(
               <TextInput
@@ -83,7 +86,7 @@ const Step2 = () => {
           />
           <Button
             variant="rainbow"
-            value="Save"
+            value={t('common.save')}
             onClick={() => navigator.navigate('home')}
             loading={loading}
             disabled={!disabled}
diff --git a/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx b/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
index 008152c8..da80095c 100644
--- a/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
+++ b/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
@@ -1,4 +1,5 @@
 import React, { useState } from 'react'
+import { useTranslation } from 'react-i18next';
 import useStyles from '../styles';
 import { CloudUpload } from '@material-ui/icons';
 import CloseIcon from '@material-ui/icons/Close';
@@ -6,8 +7,10 @@ import { useEffect } from 'react';
 import GradientFile from '@assets/icons/gradient-file.svg';
 import { Typography } from '@material-ui/core';
 import RedWarningIcon from '@assets/icons/red-warning-icon.svg';
+import { Plug } from "@components";
 
-const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
+const DragDropBox = ({ acceptedExtension, setLoading, setDisabled }) => {
+  const { t } = useTranslation();
   const classes = useStyles();
 
   const [dragActive, setDragActive] = useState(false);
@@ -18,7 +21,7 @@ const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
     setFile(null);
     setDisabled(false);
   }
- 
+
   useEffect(() => {
     if (fileNotSupported) {
       setTimeout(() => {
@@ -30,7 +33,7 @@ const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
 
   // could be a good feature for the future accept more than one extension
   const checkDesiredFile = (fileObject) => {
-    setLoading(true); 
+    setLoading(true);
     setLoading(false);
     const fileExt = fileObject[0]?.name.split('.').pop();
     if (fileExt === acceptedExtension) {
@@ -101,22 +104,35 @@ const DragDropBox = ({acceptedExtension, setLoading, setDisabled}) => {
               </>
             ) : (
               <>
-                <CloudUpload style={{ color: '#BBBEC2' }} fontSize='large' />
-                <Typography className={classes.dragDropText} variant='h6'>
-                  Drag and Drop <br />
-                  or <label className={classes.inputFileLabel} id="label-file-upload" htmlFor="input-file-upload">browse</label>
-                </Typography>
+                {
+                  dragActive ? (
+                    <div className={classes.dropItContainer}>
+                      <Plug size="small" /> 
+                      <span className={classes.dropItLabel}>
+                        {t('importPem.dropIt')}
+                      </span>
+                    </div>
+                  ) : (
+                    <>
+                      <CloudUpload style={{ color: '#BBBEC2' }} fontSize='large' />
+                      <Typography className={classes.dragDropText} variant='h6'>
+                        {t('importPem.dragAndDrop')}<br />
+                        {t('importPem.or')} <label className={classes.inputFileLabel} id="label-file-upload" htmlFor="input-file-upload">{t('importPem.browse')}</label>
+                      </Typography>
+                    </>
+                  )
+                }
               </>
             )
           }
         </form>
         {
-        fileNotSupported && (
-          <span className={classes.error}>
-            <img src={RedWarningIcon} alt="" /> File not supported. Try a different file.
-          </span>
-        )
-      }
+          fileNotSupported && (
+            <span className={classes.error}>
+              <img src={RedWarningIcon} alt="" /> {t('importPem.fileNotSupported')}
+            </span>
+          )
+        }
       </div>
     </>
   )
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index 86b75d71..ac35df06 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -22,14 +22,14 @@ const useSteps = () => {
       component: <Step1 handleChangeStep={handleChangeStep} />,
       left: leftButton(() => handleClose()),
       right: rightButton,
-      center: 'Import PEM file',
+      center: `${t("importPem.importPEMfile")}`,
     },
     {
       component: <Step2
         handleClose={handleClose}
       />,
       right: rightButton,
-      center: 'Wallet Details',
+      center: `${t("importPem.walletDetails")}`,
     },
   ];
 
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 9697e4b7..1fec2cea 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -91,6 +91,10 @@ export default makeStyles((theme) => ({
     alignItems: 'center',
     gap: 10,
   },
+  dropItLabel: {
+    fontSize: 22,
+    fontStyle: "bold",
+  },
   dragFileElement: {
     position: 'absolute',
     width: '100vw',

From aa14fc4887ca9dad04d783f62ab39404670348bf Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Mon, 26 Sep 2022 17:38:03 -0600
Subject: [PATCH 064/132] Updated controller to 0.21.1

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

diff --git a/package.json b/package.json
index 3f8833a5..04aef577 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.11",
-    "@psychedelic/plug-controller": "0.21.0",
+    "@psychedelic/plug-controller": "0.21.1",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index e46fd908..88f098c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1801,10 +1801,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.21.0":
-  version "0.21.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.0/48e547f647bcbd1723cd4536688bf07811b15ee7#48e547f647bcbd1723cd4536688bf07811b15ee7"
-  integrity sha512-L/Jkrl7tjIosZth1IKj5d0m+pTbsB+y1LgFRpI1LJsXEoWbgzEjwsesgeN5BvNNbqW+SMPTPcUusk+Fug6WaFA==
+"@psychedelic/plug-controller@0.21.1":
+  version "0.21.1"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.1/f3ce2f484a69770307791411f020254eb952f55f#f3ce2f484a69770307791411f020254eb952f55f"
+  integrity sha512-NlS459mNIH+86N+dYViG5b4fw/QLiAf5GLP69Zl5/pZ/e7EH8sPg2qhklblC/sytGZ94wmNxkIXqXt20EtB0XA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 33945828e3e224e6471d0f9369a37403d6aedf1c Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Tue, 27 Sep 2022 09:47:32 -0500
Subject: [PATCH 065/132] Prevented default on Profile actions (#611)

---
 source/components/Profile/components/AccountItem/index.jsx | 6 +++---
 source/components/Profile/index.jsx                        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 547fb20e..9779f47c 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -37,7 +37,7 @@ const AccountItem = ({
     <div
       className={clsx(classes.accountItemContainer, isHidden && classes.hiddenAccount)}
       itemNameTestId="account-name"
-      onClick={handleEditAccount(account)}
+      onClick={(e) => handleEditAccount(e, account)}
     >
       <div className={classes.leftContainer}>
         <UserIcon
@@ -56,7 +56,7 @@ const AccountItem = ({
       <div className={classes.rightContainer}>
         <IconButton
           disabled={isCurrentAccount || isHidden}
-          onClick={handleChangeAccount(account.walletId)}
+          onClick={(e) => handleChangeAccount(e, account.walletId)}
         >
           <img
             className={clsx((isCurrentAccount || isHidden) && classes.disabledIcon)}
@@ -65,7 +65,7 @@ const AccountItem = ({
         </IconButton>
         <IconButton
           disabled={isHidden}
-          onClick={handleEditAccount(account)}
+          onClick={(e) => handleEditAccount(e, account)}
         >
           <img
             className={clsx(isHidden && classes.disabledIcon)}
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index a5d961ce..39d99d8e 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -86,8 +86,7 @@ const Profile = ({ disableProfile }) => {
     }
   };
 
-  const handleEditAccount = (account) => (e) => {
-    e.preventDefault();
+  const handleEditAccount = (e, account) => {
     e.stopPropagation();
     dispatch(setEditAccount(account));
     setOpen(false);
@@ -145,7 +144,8 @@ const Profile = ({ disableProfile }) => {
       });
   };
 
-  const handleChangeAccount = (wallet) => () => {
+  const handleChangeAccount = (e, wallet) => {
+    e.stopPropagation();
     setSelectedWallet(wallet);
     extensionizer.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => {
       const url = getTabURL(tabs?.[0]);

From 5369964ab9a6c5bfc11fe1f01cf9d88c65a26dc9 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 27 Sep 2022 15:23:51 -0600
Subject: [PATCH 066/132] Refactored nft collections view to add virtualized
 support for huge number of nfts in a collection. This is achieved by building
 rows of 3 elements and virtualizing such rows. Refactored nft details screen
 to dynamically fetch the details of an NFT on render

---
 package.json                                  |  3 +-
 .../NFTs/components/NFTCollection/index.jsx   | 98 ++++++++++++-------
 .../NFTs/components/NFTCollection/styles.js   |  2 +-
 source/views/Extension/Views/Home/index.jsx   |  2 +-
 .../Extension/Views/NFTDetails/index.jsx      | 52 ++++++----
 yarn.lock                                     | 85 ++++++++--------
 6 files changed, 144 insertions(+), 98 deletions(-)

diff --git a/package.json b/package.json
index 04aef577..e3dccc13 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.11",
-    "@psychedelic/plug-controller": "0.21.1",
+    "@psychedelic/plug-controller": "../plug-controller",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
@@ -58,6 +58,7 @@
     "random-color": "^1.0.1",
     "react": "^17.0.1",
     "react-collapsible": "^2.8.4",
+    "react-cool-virtual": "^0.7.0",
     "react-dom": "^17.0.1",
     "react-feather": "^2.0.9",
     "react-i18next": "^11.8.13",
diff --git a/source/components/NFTs/components/NFTCollection/index.jsx b/source/components/NFTs/components/NFTCollection/index.jsx
index 868cf44e..4bb6f6a1 100644
--- a/source/components/NFTs/components/NFTCollection/index.jsx
+++ b/source/components/NFTs/components/NFTCollection/index.jsx
@@ -1,10 +1,11 @@
-import React, { useState } from 'react';
+import React, { useState, useMemo } from 'react';
 import Collapsible from 'react-collapsible';
 import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
 import clsx from 'clsx';
 import { Typography } from '@material-ui/core';
 import { ChevronDown } from 'react-feather';
+import useVirtual from 'react-cool-virtual';
 
 import { shortICNSName } from '@shared/services/ICNS';
 import { useRouter } from '@components/Router';
@@ -32,6 +33,21 @@ function NFTCollection({
   const toggleExpanded = () => setExpanded(!expanded);
   const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[collection.canisterId];
 
+  const rows = useMemo(() => {
+    const itemCount = collection?.tokens?.length || 0;
+    const COLUMNS = 3;
+    const rowsCount = Math.ceil(itemCount / COLUMNS);
+    // Generate an array of rows with 3 items each
+    const nftRows = Array.from(
+      Array(rowsCount), (_, i) => collection.tokens.slice(i * COLUMNS, i * COLUMNS + COLUMNS),
+    );
+    return nftRows;
+  }, [collection]);
+
+  const { outerRef, innerRef, items: itemRows } = useVirtual({
+    itemCount: rows?.length || 0, // Provide the total number for the list items
+    itemSize: 150, // The size of each row (img + title)
+  });
   return (
     <Collapsible
       transitionTime={200}
@@ -64,40 +80,52 @@ function NFTCollection({
         </div>
         )}
     >
-      <div className={clsx(classes.grid, expanded && classes.expanded)}>
-        {collection?.tokens?.map((nft) => {
-          const name = nft.name || `#${nft.index}`;
-          return (
-            <div
-              className={classes.nftContainer}
-              onClick={() => handleNftClick(nft)}
-              data-testid={`nft-id-${name}`}
-            >
-              {icns ? (
-                <ICNSDisplay
-                  icns={nft}
-                  className={classes.nft}
-                  onClick={() => handleNftClick(nft)}
-                />
-              ) : (
-                <NFTDisplayer
-                  url={nft.url}
-                  className={classes.nft}
-                  defaultTag={nftDefaultTag}
-                  onClick={() => handleNftClick(nft)}
-                />
-              )}
-              {!icns && (
-              <Typography
-                className={classes.id}
-                variant="subtitle1"
-              >
-                {name.length > 12 ? shortICNSName(name) : name}
-              </Typography>
-              )}
-            </div>
-          );
-        })}
+      <div ref={outerRef} style={{ height: expanded ? `${Math.min(300, 150 * rows.length)}px` : 'auto', overflow: 'auto' }}>
+        {expanded && (
+          <div ref={innerRef}>
+            {itemRows?.map(({ index, size }) => {
+              const rowNfts = rows[index];
+              return (
+                <div key={index} className={classes.grid} style={{ height: size }}>
+                  {rowNfts?.map((nft) => {
+                    const name = nft?.name || `#${nft?.index}`;
+                    return (
+                      <div
+                        className={classes.nftContainer}
+                        onClick={() => handleNftClick(nft)}
+                        data-testid={`nft-id-${name}`}
+                        style={{ height: `${size}px` }}
+                      >
+                        {icns ? (
+                          <ICNSDisplay
+                            icns={nft}
+                            className={classes.nft}
+                            onClick={() => handleNftClick(nft)}
+                          />
+                        ) : (
+                          <NFTDisplayer
+                            url={nft.url}
+                            className={classes.nft}
+                            defaultTag={nftDefaultTag}
+                            onClick={() => handleNftClick(nft)}
+                          />
+                        )}
+                        {!icns && (
+                        <Typography
+                          className={classes.id}
+                          variant="subtitle1"
+                        >
+                          {name.length > 12 ? shortICNSName(name) : name}
+                        </Typography>
+                        )}
+                      </div>
+                    );
+                  })}
+                </div>
+              );
+            })}
+          </div>
+        )}
       </div>
     </Collapsible>
   );
diff --git a/source/components/NFTs/components/NFTCollection/styles.js b/source/components/NFTs/components/NFTCollection/styles.js
index 6eae7495..4bdfda6c 100644
--- a/source/components/NFTs/components/NFTCollection/styles.js
+++ b/source/components/NFTs/components/NFTCollection/styles.js
@@ -11,7 +11,7 @@ export default makeStyles(() => ({
     display: 'grid',
     justifyContent: 'space-evenly',
     gridTemplateColumns: 'repeat(auto-fill, 112px)',
-    overflow: 'hidden',
+    padding: '0 5px',
   },
   nft: {
     height: 112,
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 7e47441f..6779d4e2 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -80,7 +80,7 @@ const Home = () => {
     extension.tabs.query({ active: true, lastFocusedWindow: true }, (browserTabs) => {
       const currentTab = browserTabs?.[0];
       const url = getTabURL(currentTab);
-      const ids = state.wallets.map((_, idx) => idx);
+      const ids = Object.values(state.wallets).map((_, idx) => idx);
       setTab(currentTab);
       getWalletsConnectedToUrl(url, ids, (_connectedWallets = []) => {
         setConnectedWallets(_connectedWallets);
diff --git a/source/views/Extension/Views/NFTDetails/index.jsx b/source/views/Extension/Views/NFTDetails/index.jsx
index 414388a5..d4543519 100644
--- a/source/views/Extension/Views/NFTDetails/index.jsx
+++ b/source/views/Extension/Views/NFTDetails/index.jsx
@@ -1,31 +1,42 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { HttpAgent } from '@dfinity/agent';
 import {
   Layout,
   Header, Button, Badge, LinkButton, NFTDisplayer, ICNSDisplay,
 } from '@components';
 import { useTranslation } from 'react-i18next';
+import { getNFTActor } from '@psychedelic/dab-js';
+import { Typography } from '@material-ui/core';
+import { ArrowUpRight } from 'react-feather';
+import extension from 'extensionizer';
+
 import BackIcon from '@assets/icons/back.svg';
 import ExpandIcon from '@assets/icons/expand.svg';
-import { useDispatch, useSelector } from 'react-redux';
 import { TABS, useRouter } from '@components/Router';
 import CollectionImg from '@assets/icons/nfts/collection.png';
 import DescriptionImg from '@assets/icons/nfts/description.png';
 import AttributesImg from '@assets/icons/nfts/attributes.png';
 import AboutImg from '@assets/icons/nfts/about.png';
-import { Typography } from '@material-ui/core';
 import { setSelectedNft } from '@redux/nfts';
-import { ArrowUpRight } from 'react-feather';
-import extension from 'extensionizer';
 import { NFT_COLLECTION_DEFAULT_TYPES } from '@shared/constants/nft';
 
 import Section from './components/section';
 import useStyles from './styles';
 
+const getTokenDetails = async ({ index, canister, standard }) => {
+  const agent = new HttpAgent({ host: 'https://ic0.app/' });
+  const NFTActor = getNFTActor({ canisterId: canister, standard, agent });
+  const details = await NFTActor.details(index);
+  return details;
+}
+
 const NFTDetails = () => {
   const { t } = useTranslation();
   const { selectedNft: nft } = useSelector((state) => state.nfts);
   const { collections } = useSelector((state) => state.wallet);
   const { navigator: routerNavigator } = useRouter();
+  const [populatedNFT, setPopulatedNFT] = useState(nft);
   const classes = useStyles();
   const dispatch = useDispatch();
   if (!nft) {
@@ -38,15 +49,15 @@ const NFTDetails = () => {
     routerNavigator.navigate('home', TABS.NFTS);
   };
 
-  const collection = useMemo(() => collections?.find((col) => col.name === nft?.collection),
-    [collections, nft]);
+  const collection = useMemo(() => collections?.find((col) => col.canisterId === populatedNFT?.canister),
+    [collections, populatedNFT]);
 
-  const name = `${nft?.name ?? `#${nft?.index}`}`;
-  const isICNS = nft?.collection === 'ICNS';
+  const name = `${populatedNFT?.name ?? `#${populatedNFT?.index}`}`;
+  const isICNS = collection === 'ICNS';
 
   const openNFT = (url) => {
     const parsedUrl = isICNS
-      ? `https://icns.id/domains/${nft?.name.replace('.icp', '')}/detail`
+      ? `https://icns.id/domains/${populatedNFT?.name.replace('.icp', '')}/detail`
       : url;
 
     extension.tabs.create({
@@ -59,10 +70,12 @@ const NFTDetails = () => {
   // eslint-disable-next-line no-confusing-arrow
   const handleButtonClick = (url) => isICNS ? openNFT(url) : copyNFT(url);
 
-  const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[nft.canisterId];
+  const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[populatedNFT.canister];
 
   useEffect(() => {
     window.scrollTo(0, 0);
+    console.log(nft);
+    getTokenDetails(nft).then((details) => setPopulatedNFT({ ...nft, ...details }));
   }, []);
 
   return (
@@ -76,15 +89,14 @@ const NFTDetails = () => {
             src={ExpandIcon}
             data-testid="expand-nft"
             onClick={() => openNFT(nft?.url?.replace('type=thumbnail', ''))}
-            data-testid="expand-nft"
           />
         )}
       />
       <div className={classes.container}>
         {isICNS ? (
-          <ICNSDisplay icns={nft} className={classes.image} large />
+          <ICNSDisplay icns={populatedNFT} className={classes.image} large />
         ) : (
-          <NFTDisplayer url={nft?.url} className={classes.image} defaultTag={nftDefaultTag} interactive />
+          <NFTDisplayer url={populatedNFT?.url} className={classes.image} defaultTag={nftDefaultTag} interactive />
         )}
         <div className={classes.buttonContainer}>
           <Button
@@ -92,7 +104,7 @@ const NFTDetails = () => {
             value={t(`nfts.${isICNS ? 'manage' : 'copyLink'}`)}
             style={{ width: '96%' }}
             fullWidth
-            onClick={() => handleButtonClick(nft?.url?.replace('type=thumbnail', ''))}
+            onClick={() => handleButtonClick(populatedNFT?.url?.replace('type=thumbnail', ''))}
             buttonTestId="copy-link-button"
             endIcon={isICNS && (
               <ArrowUpRight
@@ -112,18 +124,18 @@ const NFTDetails = () => {
           />
         </div>
         <Section icon={CollectionImg} title={t('nfts.collection')}>
-          <Badge value={nft?.collection} icon={collection?.icon} iconClassName={classes.icnsIcon} />
+          <Badge value={collection?.name} icon={collection?.icon} iconClassName={classes.icnsIcon} />
           <Badge value={name} />
         </Section>
-        {!!nft?.desc && (
+        {!!populatedNFT?.desc && (
           <Section icon={DescriptionImg} title={t('nfts.description')}>
-            <Typography variant="subtitle1">{nft?.desc}</Typography>
+            <Typography variant="subtitle1">{populatedNFT?.desc}</Typography>
           </Section>
         )}
-        {nft?.metadata?.properties?.filter((prop) => typeof prop?.value !== 'object')?.length >= 1 && (
+        {populatedNFT?.metadata?.properties?.filter((prop) => typeof prop?.value !== 'object')?.length >= 1 && (
           <Section icon={AttributesImg} title={t('nfts.attributes')}>
             {
-              nft?.metadata?.properties?.map((prop) => ((
+              populatedNFT?.metadata?.properties?.map((prop) => ((
                 <Badge
                   name={prop.name}
                   value={prop?.value}
diff --git a/yarn.lock b/yarn.lock
index 88f098c3..f34cc658 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -978,7 +978,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
   integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
@@ -1801,10 +1801,8 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.21.1":
+"@psychedelic/plug-controller@../plug-controller":
   version "0.21.1"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.1/f3ce2f484a69770307791411f020254eb952f55f#f3ce2f484a69770307791411f020254eb952f55f"
-  integrity sha512-NlS459mNIH+86N+dYViG5b4fw/QLiAf5GLP69Zl5/pZ/e7EH8sPg2qhklblC/sytGZ94wmNxkIXqXt20EtB0XA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1876,9 +1874,9 @@
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
 "@sinclair/typebox@^0.24.1":
-  version "0.24.42"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.42.tgz#a74b608d494a1f4cc079738e050142a678813f52"
-  integrity sha512-d+2AtrHGyWek2u2ITF0lHRIv6Tt7X0dEHW+0rP+5aDCEjC3fiN2RBjrLD0yU0at52BcZbRGxLbAtXiR0hFCjYw==
+  version "0.24.43"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.43.tgz#2e2bce0e5e493aaf639beed0cd6c88cfde7dd3d7"
+  integrity sha512-1orQTvtazZmsPeBroJjysvsOQCYV2yjWlebkSY38pl5vr2tdLjEJ+LoxITlGNZaH2RE19WlAwQMkH/7C14wLfw==
 
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
@@ -1933,9 +1931,9 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.1.tgz#ce5e2c8c272b99b7a9fd69fa39f0b4cd85028bd9"
-  integrity sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309"
+  integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==
   dependencies:
     "@babel/types" "^7.3.0"
 
@@ -1995,9 +1993,9 @@
     "@types/node" "*"
 
 "@types/har-format@*":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.8.tgz#e6908b76d4c88be3db642846bb8b455f0bfb1c4e"
-  integrity sha512-OP6L9VuZNdskgNN3zFQQ54ceYD8OLq5IbqO4VK91ORLfOm7WdT/CiT/pHEBSQEqCInJ2y3O6iCm/zGtPElpgJQ==
+  version "1.2.9"
+  resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.9.tgz#b9b3a9bfc33a078e7d898a00b09662910577f4a4"
+  integrity sha512-rffW6MhQ9yoa75bdNi+rjZBAvu2HhehWJXlhuWXnWdENeuKe82wUgAwxYOb7KRKKmxYN+D/iRKd2NDQMLqlUmg==
 
 "@types/hoist-non-react-statics@^3.3.0":
   version "3.3.1"
@@ -2060,9 +2058,9 @@
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/node@*":
-  version "18.7.18"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154"
-  integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==
+  version "18.7.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.23.tgz#75c580983846181ebe5f4abc40fe9dfb2d65665f"
+  integrity sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg==
 
 "@types/node@11.11.6":
   version "11.11.6"
@@ -2075,9 +2073,9 @@
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prettier@^2.1.5":
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc"
-  integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
+  integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
 
 "@types/prop-types@*":
   version "15.7.5"
@@ -2209,9 +2207,9 @@
     "@types/yargs-parser" "*"
 
 "@types/yargs@^17.0.8":
-  version "17.0.12"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526"
-  integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==
+  version "17.0.13"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
+  integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -4100,9 +4098,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001407:
-  version "1.0.30001410"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz#b5a86366fbbf439d75dd3db1d21137a73e829f44"
-  integrity sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==
+  version "1.0.30001412"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz#30f67d55a865da43e0aeec003f073ea8764d5d7c"
+  integrity sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -4623,16 +4621,16 @@ copy-webpack-plugin@^6.3.1:
     webpack-sources "^1.4.3"
 
 core-js-compat@^3.25.1:
-  version "3.25.2"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.2.tgz#7875573586809909c69e03ef310810c1969ee138"
-  integrity sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==
+  version "3.25.3"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.3.tgz#d6a442a03f4eade4555d4e640e6a06151dd95d38"
+  integrity sha512-xVtYpJQ5grszDHEUU9O7XbjjcZ0ccX3LgQsyqSvTnjX97ZqEgn9F5srmrwwwMtbKzDllyFPL+O+2OFMl1lU4TQ==
   dependencies:
     browserslist "^4.21.4"
 
 core-js-pure@^3.25.1:
-  version "3.25.2"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.2.tgz#44a4fd873bdd4fecf6ca11512bcefedbe87e744a"
-  integrity sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA==
+  version "3.25.3"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.25.3.tgz#66ac5bfa5754b47fdfd14f3841c5ed21c46db608"
+  integrity sha512-T/7qvgv70MEvRkZ8p6BasLZmOVYKzOaWNBEHAU8FmveCJkl4nko2quqPQOmy6AJIp5MBanhz9no3A94NoRb0XA==
 
 core-js@^2.4.0:
   version "2.6.12"
@@ -5405,9 +5403,9 @@ ed25519-hd-key@^1.2.0:
     tweetnacl "1.0.3"
 
 electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.251:
-  version "1.4.258"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz#44c5456f487be082f038282fbcfd7b06ae99720d"
-  integrity sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A==
+  version "1.4.263"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.263.tgz#4cbb8263165cd6d7d1ffb39ce27e2ce6a7f6cb5b"
+  integrity sha512-RcvChwbVkZBe7e+B23+wjXJgRHTy9Byu6JEL8HuNKILALs98deLnyGqv73nvwRKj6VGghrwnwKWC3ukVhQDvpQ==
 
 elliptic@^6.5.3, elliptic@^6.5.4:
   version "6.5.4"
@@ -7166,9 +7164,9 @@ is-buffer@^1.0.2, is-buffer@^1.1.5:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-callable@^1.1.4, is-callable@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.6.tgz#fd6170b0b8c7e2cc73de342ef8284a2202023c44"
-  integrity sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -10705,6 +10703,13 @@ react-collapsible@^2.8.4:
   resolved "https://registry.yarnpkg.com/react-collapsible/-/react-collapsible-2.10.0.tgz#57330f9f4f968a41ece49c651b56cf30f9a06d19"
   integrity sha512-kEVsmlFfXBMTCnU5gwIv19MdmPAhbIPzz5Er37TiJSzRKS0IHrqAKQyQeHEmtoGIQMTcVI46FzE4z3NlVTx77A==
 
+react-cool-virtual@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/react-cool-virtual/-/react-cool-virtual-0.7.0.tgz#8fa5d8b622b1c73406f4542eba8cd75de3bc3558"
+  integrity sha512-oWRsF0Pf9dRWncpFvsCNWm0W/d/UEbUqxNIuhGEcLzdW16leokcl9gSYG9Ha5raaF/qq029W1cj65zAwgJyR7A==
+  dependencies:
+    "@babel/runtime" "^7.16.7"
+
 react-dom@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
@@ -11366,9 +11371,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
     aproba "^1.1.1"
 
 rxjs@^7.5.4, rxjs@^7.5.5:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc"
-  integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==
+  version "7.5.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39"
+  integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==
   dependencies:
     tslib "^2.1.0"
 

From 8c8b07e700cd584ffba3f5edbd557513d0867b39 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 27 Sep 2022 17:29:46 -0600
Subject: [PATCH 067/132] Removed refresh logic from GET_ASSETS hook

---
 package.json                       |  2 +-
 source/Background/Keyring/index.js | 20 +++++---------------
 yarn.lock                          |  6 ++----
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 3f8833a5..7b2d2bb7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.11",
-    "@psychedelic/plug-controller": "0.21.0",
+    "@psychedelic/plug-controller": "../plug-controller",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 5237d077..170fb498 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -206,22 +206,12 @@ export const getKeyringHandler = (type, keyring) => ({
     const parsed = parseTransactions(response);
     return parsed;
   },
-  [HANDLER_TYPES.GET_ASSETS]: async ({ refresh }) => {
+  [HANDLER_TYPES.GET_ASSETS]: async () => {
     try {
       if (!keyring?.isUnlocked) return {};
-
-      const { wallets, currentWalletId } = await keyring.getState();
-      let assets = Object.values(wallets?.[currentWalletId]?.assets);
-      const shouldUpdate = Object.values(assets)?.every((asset) => !Number(asset.amount))
-        || Object.values(assets)?.some((asset) => asset.amount === 'Error')
-        || refresh;
-      if (shouldUpdate) {
-        assets = await keyring.getBalances();
-      } else {
-        keyring.getBalances();
-      }
-      assets = parseAssetsAmount(assets);
-      return (assets || []).map((asset) => recursiveParseBigint(asset));
+      const assets = await keyring.getBalances();
+      const parsedAssets = parseAssetsAmount(assets);
+      return (parsedAssets || []).map((asset) => recursiveParseBigint(asset));
     } catch (e) {
       // eslint-disable-next-line
       console.log('Error while fetching the assets', e);
@@ -478,7 +468,7 @@ export const getKeyringHandler = (type, keyring) => ({
       console.log('Error removing the network', e);
       return { error: e.message };
     }
-  }
+  },
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {
diff --git a/yarn.lock b/yarn.lock
index e46fd908..74612df7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1801,10 +1801,8 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.21.0":
-  version "0.21.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.0/48e547f647bcbd1723cd4536688bf07811b15ee7#48e547f647bcbd1723cd4536688bf07811b15ee7"
-  integrity sha512-L/Jkrl7tjIosZth1IKj5d0m+pTbsB+y1LgFRpI1LJsXEoWbgzEjwsesgeN5BvNNbqW+SMPTPcUusk+Fug6WaFA==
+"@psychedelic/plug-controller@../plug-controller":
+  version "0.23.0"
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 829f33071468937d63ff72a606a2af77a287d6ab Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 28 Sep 2022 11:59:34 -0500
Subject: [PATCH 068/132] remove switch account icon (#613)

---
 .../Profile/components/AccountItem/index.jsx         | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 9779f47c..4793c7c4 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -6,7 +6,6 @@ import { useHiddenAccounts, toggleAccountHidden } from '@redux/profile';
 
 import BluePencil from '@assets/icons/blue-pencil.svg';
 import InvisibleIcon from '@assets/icons/invisible.svg';
-import SwitchAccount from '@assets/icons/switch-account.svg';
 import VisibleIcon from '@assets/icons/visible.svg';
 
 import UserIcon from '../../../UserIcon';
@@ -37,7 +36,7 @@ const AccountItem = ({
     <div
       className={clsx(classes.accountItemContainer, isHidden && classes.hiddenAccount)}
       itemNameTestId="account-name"
-      onClick={(e) => handleEditAccount(e, account)}
+      onClick={(e) => handleChangeAccount(e, account.walletId)}
     >
       <div className={classes.leftContainer}>
         <UserIcon
@@ -54,15 +53,6 @@ const AccountItem = ({
         </div>
       </div>
       <div className={classes.rightContainer}>
-        <IconButton
-          disabled={isCurrentAccount || isHidden}
-          onClick={(e) => handleChangeAccount(e, account.walletId)}
-        >
-          <img
-            className={clsx((isCurrentAccount || isHidden) && classes.disabledIcon)}
-            src={SwitchAccount}
-          />
-        </IconButton>
         <IconButton
           disabled={isHidden}
           onClick={(e) => handleEditAccount(e, account)}

From 815c6bb3c39bfae01f6ae0a47c39ed428222c1ee Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Thu, 29 Sep 2022 21:59:44 +0200
Subject: [PATCH 069/132] automation fixes

---
 .gitignore                                    |  3 +
 .../Profile/components/AccountItem/index.jsx  |  4 +-
 .../Tokens/components/TokenSelector/index.jsx |  2 +-
 source/components/Tokens/index.jsx            |  2 +-
 .../Extension/Views/WalletDetails/index.jsx   |  2 +-
 tests/README.md                               | 80 +++++++++++++++++++
 tests/e2e/send-tokens.test.js                 |  8 ++
 7 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 tests/README.md

diff --git a/.gitignore b/.gitignore
index 091a2a97..1b57587b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,9 @@ typings/
 .env
 .env.test
 
+# PEM files
+*.pem
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 
diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 4793c7c4..6d5dacb2 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -35,7 +35,6 @@ const AccountItem = ({
   return (
     <div
       className={clsx(classes.accountItemContainer, isHidden && classes.hiddenAccount)}
-      itemNameTestId="account-name"
       onClick={(e) => handleChangeAccount(e, account.walletId)}
     >
       <div className={classes.leftContainer}>
@@ -47,13 +46,14 @@ const AccountItem = ({
         <div
           className={classes.accountDetails}
         >
-          <span className={classes.accountName}>
+          <span className={classes.accountName} data-testid={`account-name-${account.name}`}>
             {account.icnsData.reverseResolvedName ? account.icnsData.reverseResolvedName : account.name }
           </span>
         </div>
       </div>
       <div className={classes.rightContainer}>
         <IconButton
+          data-testid={`edit-button-${account.name}`}
           disabled={isHidden}
           onClick={(e) => handleEditAccount(e, account)}
         >
diff --git a/source/components/Tokens/components/TokenSelector/index.jsx b/source/components/Tokens/components/TokenSelector/index.jsx
index bc463319..5f448236 100644
--- a/source/components/Tokens/components/TokenSelector/index.jsx
+++ b/source/components/Tokens/components/TokenSelector/index.jsx
@@ -27,7 +27,7 @@ const TokenSelector = ({ onClose }) => {
       <div
         onClick={() => navigator.navigate('add-nft')}
         className={classes.addNftButton}
-        data-testid="add-custom-token-button"
+        data-testid="add-custom-nft-button"
       >
         <img
           src={imageIcon}
diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index 85ae9ec7..7cd2bb01 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -106,7 +106,7 @@ const Tokens = () => {
       <div
         onClick={() => setDisplayCustomToken(!displayCustomToken)}
         className={classes.buttonWrapper}
-        data-testid="add-custom-token-button"
+        data-testid="add-button"
       >
         <Plus size="30" className={classes.icon} strokeWidth={2.5} />
       </div>
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 34411ff0..c24b7548 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -354,7 +354,6 @@ const WalletDetails = () => {
                 { walletId !== activeWalletId && (
                   <button
                     type="button"
-                    data-testid="edit-icon-button"
                     onClick={handleChangeAccount}
                   >
                     <img
@@ -364,6 +363,7 @@ const WalletDetails = () => {
                 )}
                 {
                   <button
+                    data-testid="edit-icon-button"
                     type="button"
                     onClick={openEditWalletName}
                   >
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 00000000..88857116
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,80 @@
+![Plug Banner](https://storageapi.fleek.co/fleek-team-bucket/plug-banner.png)
+
+# 🔌 Plug Extension - E2E Tests
+
+[![Fleek](https://img.shields.io/badge/Made%20by-Fleek-blue)](https://fleek.co/)
+[![Discord](https://img.shields.io/badge/Discord-Channel-blue)](https://discord.gg/yVEcEzmrgm)
+
+## 📖 Introduction
+
+This folder contains E2E tests for Plug Extensions written using Puppeteer.
+
+#### ✅ Covered functionalities:
+
+- Create wallet
+- Import wallet
+- Send tokens
+- Send custom tokens
+- Send NFTs
+- Deposit view
+- Add custom token
+- Add network
+- Edit account
+- Create account
+- Lock wallet
+- Settings: Contacts
+- Settings: Secret Recovery Phrase
+- Settings: Network
+- Settings: Export DFX Identity 
+- Settings: Help 
+
+## ⚙️ Development
+
+You need to perform following actions to start developing new tests:
+
+1. Clone Plug Extension repository
+2. Install dependencies by running `yarn`
+3. Switch directory `cd tests`
+4. Create new Plug Extension build by running `yarn build`
+5. Run tests with `yarn test` or `yarn test:watch` command.
+6. Enjoy! 🙌
+
+> ⚠️ IMPORTANT NOTE:
+Tests couldn't be used in CI/CD process due to lack of headless mode for extensions, so they should be run in the release branch before the merge
+
+### 📗 Elements selection 
+
+### <em> Elements Must Be Selectable by <strong> data-testid</strong> property</em>, e.g:
+
+```html
+<Button data-testid="add-network-button" variant="rainbow" onClick={handleAddNetwork} /> 
+```
+
+### 🔐 Environment variables 
+
+| Variable        | Usage      |
+| ------------- |:-------------:| 
+| `SEEDPHRASE`      | Seedphrase to unlock test wallet |
+| `MAIN_PRINCIPAL_ID`     | Principal ID of test wallet main account      |  
+| `MAIN_ACCOUNT_ID` | Account ID of test wallet main account      | 
+| `SUB_PRINCIPAL_ID` | Principal ID of test wallet sub account      | 
+| `SUB_ACCOUNT_ID` | Account ID of test wallet sub account      | 
+| `ICNS_NAME` | ICNS name | 
+| `PASSWORD` | Wallet password      | 
+| `DUST_CANISTER_ID` | DUST Canister ID      | 
+| `BETA_CANISTER_ID` |   BETA Canister ID  | 
+| `WTC_CANISTER_ID` | WTC Canister ID      | 
+| `XTC_CANISTER_ID` | XTC Canister ID      | 
+| `WICP_CANISTER_ID` | WICP Canister ID      | 
+| `TEST_COIN_CANISTER_ID` | TEST Canister ID      | 
+| `WRONG_ID` | Wrong Principal ID     | 
+| `WRONG_ACCOUNT_ID` | Wrong Account ID      | 
+| `WRONG_CANISTER_ID` | Wrong Canister ID      | 
+| `WRONG_ICNS_NAME` | Non-existing ICNS name      |
+| `NETWORK_NAME` | Network name      |
+| `HOST_NAME` | Network Host name      |
+| `CANISTER_ID` | Network Canister ID     |
+| `WRONG_HOST_NAME` | Wrong Network Host name      |
+
+
+
diff --git a/tests/e2e/send-tokens.test.js b/tests/e2e/send-tokens.test.js
index 982354ee..68ff803c 100644
--- a/tests/e2e/send-tokens.test.js
+++ b/tests/e2e/send-tokens.test.js
@@ -21,6 +21,11 @@ const waitForBalanceChange = async (page) => {
   await page.waitForTimeout(40000);
 };
 
+const addButtonClick = async (page) => {
+  const addTokenButton = await page.getByTestId('add-button', true);
+  await addTokenButton.click();
+};
+
 const addCustomTokenButtonClick = async (page) => {
   const addCustomTokenButton = await page.getByTestId('add-custom-token-button', true);
   await addCustomTokenButton.click();
@@ -72,6 +77,7 @@ const selectNetworkCardClick = async (page, name) => {
 };
 
 async function addCustomToken(page, { name, canisterId, standard }) {
+  await addButtonClick(page);
   await addCustomTokenButtonClick(page);
   await addCustomTokenTabItemClick(page, 'Custom');
 
@@ -316,6 +322,7 @@ describe('Send Custom Tokens', () => {
   });
 
   test('entering wrong token standard', async () => {
+    await addButtonClick(page);
     await addCustomTokenButtonClick(page);
 
     for (const { canisterId, standard } of wrongTokenData) {
@@ -362,6 +369,7 @@ describe('Send Custom Tokens', () => {
   });
 
   test('entering wrong custom token canister ID ', async () => {
+    await addButtonClick(page);
     await addCustomTokenButtonClick(page);
     await addCustomTokenTabItemClick(page, 'Custom');
 

From 625c57f3b57bd71d9059a4fb845516d851a286e4 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Thu, 29 Sep 2022 19:04:00 -0300
Subject: [PATCH 070/132] added react-dropzone and styles to the box

---
 package.json                                  |    1 +
 .../Views/ImportWallet/Steps/Step1.jsx        |   42 +-
 .../Extension/Views/ImportWallet/styles.js    |    4 +
 yarn.lock                                     | 1427 ++++++++++-------
 4 files changed, 849 insertions(+), 625 deletions(-)

diff --git a/package.json b/package.json
index bbc856b7..b31775be 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "react": "^17.0.1",
     "react-collapsible": "^2.8.4",
     "react-dom": "^17.0.1",
+    "react-dropzone": "^14.2.2",
     "react-feather": "^2.0.9",
     "react-i18next": "^11.8.13",
     "react-json-view": "^1.21.3",
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 13f39fa2..4e03a9df 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -1,27 +1,53 @@
 import { Container, Button } from '@components'
-import Grid from '@material-ui/core/Grid';
-import React, { useState } from 'react'
+import React, { useState, useCallback } from 'react'
 import DragDropBox from '../components/DragDropBox';
 import { useTranslation } from 'react-i18next';
+import { useDropzone } from 'react-dropzone';
+import useStyles from '../styles';
+import { CloudUpload } from '@material-ui/icons';
+import { Typography, Grid } from '@material-ui/core';
+import { Plug } from "@components";
 
 const Step1 = ({handleChangeStep}) => {
   const { t } = useTranslation();
+  const classes = useStyles();
 
   const [loading, setLoading] = useState(false);
   const [disabled, setDisabled] = useState(false);
-  const ACCEPTED_FILE_EXT = 'pem';
   
+  const onDrop = useCallback(acceptedFiles => {
+    console.log(acceptedFiles);
+  }, [])
 
+  const {
+    getRootProps,
+    getInputProps,
+    isDragActive,
+  } = useDropzone({ onDrop });
 
   return (
     <Container>
       <Grid container spacing={2}>
         <Grid item xs={12}>
-          <DragDropBox
-            acceptedExtension={ACCEPTED_FILE_EXT}
-            setLoading={setLoading}
-            setDisabled={setDisabled}
-          />
+          <div className={classes.dragDropContainer} {...getRootProps()}>
+            {
+              isDragActive ? (
+                <div className={classes.dropItContainer}>
+                  <Plug size="small" /> 
+                  <span className={classes.dropItLabel}>
+                    {t('importPem.dropIt')}
+                  </span>
+                </div>
+              ) : (
+                <>
+                <input {...getInputProps()} /><CloudUpload style={{ color: '#BBBEC2' }} fontSize='large' /><Typography className={classes.dragDropText} variant='h6'>
+                    {t('importPem.dragAndDrop')}<br />
+                    {t('importPem.or')} <label className={classes.inputFileLabel} id="label-file-upload" htmlFor="input-file-upload">{t('importPem.browse')}</label>
+                  </Typography>
+                </>
+              )
+            }
+          </div>
         </Grid>
         <Grid item xs={12}>
           <Button
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 1fec2cea..226247b3 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -9,6 +9,10 @@ export default makeStyles((theme) => ({
     width: '370px',
     borderRadius: 6,
     marginBottom: 20,
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center',
+    flexDirection: 'column',
   },
   dragDropContainerError: {
     border: '2px dashed #E53C3C',
diff --git a/yarn.lock b/yarn.lock
index 0d97c09e..3e7bb7ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1119,7 +1119,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1150,7 +1150,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@isaacs/string-locale-compare@^1.1.0":
+"@isaacs/string-locale-compare@^1.0.1":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
@@ -1601,71 +1601,64 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/arborist@*", "@npmcli/arborist@^5.6.2":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.6.2.tgz#552b554f34777e5dcc8e68ad86cdaeebc0788790"
-  integrity sha512-Lyj2g+foWKzrwW2bT/RGO982VR9vb5tlvfD88n4PwWJRrDttQbJoIdcQzN9b+NIBhI1/8iEhC5b8far9U0fQxA==
+"@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0", "@npmcli/arborist@^2.8.3":
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.10.0.tgz#424c2d73a7ae59c960b0cc7f74fed043e4316c2c"
+  integrity sha512-CLnD+zXG9oijEEzViimz8fbOoFVb7hoypiaf7p6giJhvYtrxLAyY3cZAMPIFQvsG731+02eMDp3LqVBNo7BaZA==
   dependencies:
-    "@isaacs/string-locale-compare" "^1.1.0"
+    "@isaacs/string-locale-compare" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/map-workspaces" "^2.0.3"
-    "@npmcli/metavuln-calculator" "^3.0.1"
-    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/map-workspaces" "^1.0.2"
+    "@npmcli/metavuln-calculator" "^1.1.0"
+    "@npmcli/move-file" "^1.1.0"
     "@npmcli/name-from-folder" "^1.0.1"
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/package-json" "^2.0.0"
-    "@npmcli/query" "^1.2.0"
-    "@npmcli/run-script" "^4.1.3"
-    bin-links "^3.0.3"
-    cacache "^16.1.3"
+    "@npmcli/node-gyp" "^1.0.1"
+    "@npmcli/package-json" "^1.0.1"
+    "@npmcli/run-script" "^1.8.2"
+    bin-links "^2.2.1"
+    cacache "^15.0.3"
     common-ancestor-path "^1.0.1"
     json-parse-even-better-errors "^2.3.1"
     json-stringify-nice "^1.1.4"
-    minimatch "^5.1.0"
     mkdirp "^1.0.4"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    npm-install-checks "^5.0.0"
-    npm-package-arg "^9.0.0"
-    npm-pick-manifest "^7.0.2"
-    npm-registry-fetch "^13.0.0"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    parse-conflict-json "^2.0.1"
-    proc-log "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-package-arg "^8.1.5"
+    npm-pick-manifest "^6.1.0"
+    npm-registry-fetch "^11.0.0"
+    pacote "^11.3.5"
+    parse-conflict-json "^1.1.1"
+    proc-log "^1.0.0"
     promise-all-reject-late "^1.0.0"
     promise-call-limit "^1.0.1"
     read-package-json-fast "^2.0.2"
     readdir-scoped-modules "^1.1.0"
     rimraf "^3.0.2"
-    semver "^7.3.7"
-    ssri "^9.0.0"
-    treeverse "^2.0.0"
+    semver "^7.3.5"
+    ssri "^8.0.1"
+    treeverse "^1.0.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/ci-detect@*", "@npmcli/ci-detect@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-2.0.0.tgz#e63c91bcd4185ac1e85720a34fc48e164ece5b89"
-  integrity sha512-8yQtQ9ArHh/TzdUDKQwEvwCgpDuhSWTDAbiKMl3854PcT+Dk4UmWaiawuFTLy9n5twzXOBXVflWe+90/ffXQrA==
+"@npmcli/ci-detect@^1.2.0", "@npmcli/ci-detect@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
+  integrity sha512-3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q==
 
-"@npmcli/config@*":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-4.2.2.tgz#2e3334dda84f48d059309c53d152e66b05ca24b7"
-  integrity sha512-5GNcLd+0c4bYBnFop53+26CO5GQP0R9YcxlernohpHDWdIgzUg9I0+GEMk3sNHnLntATVU39d283A4OO+W402w==
+"@npmcli/config@^2.3.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/config/-/config-2.4.0.tgz#1447b0274f9502871dabd3ab1d8302472d515b1f"
+  integrity sha512-fwxu/zaZnvBJohXM3igzqa3P1IVYWi5N343XcKvKkJbAx+rTqegS5tAul4NLiMPQh6WoS5a4er6oo/ieUx1f4g==
   dependencies:
-    "@npmcli/map-workspaces" "^2.0.2"
-    ini "^3.0.0"
+    ini "^2.0.0"
     mkdirp-infer-owner "^2.0.0"
-    nopt "^6.0.0"
-    proc-log "^2.0.0"
-    read-package-json-fast "^2.0.3"
-    semver "^7.3.5"
+    nopt "^5.0.0"
+    semver "^7.3.4"
     walk-up-path "^1.0.0"
 
-"@npmcli/disparity-colors@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-2.0.0.tgz#cb518166ee21573b96241a3613fef70acb2a60ba"
-  integrity sha512-FFXGrIjhvd2qSZ8iS0yDvbI7nbjdyT2VNO7wotosjYZM2p2r8PN3B7Om3M5NO9KqW/OVzfzLB3L0V5Vo5QXC7A==
+"@npmcli/disparity-colors@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/disparity-colors/-/disparity-colors-1.0.1.tgz#b23c864c9658f9f0318d5aa6d17986619989535c"
+  integrity sha512-kQ1aCTTU45mPXN+pdAaRxlxr3OunkyztjbbxDY/aIcPS5CnCUrx+1+NvA6pTcYR7wmLZe37+Mi5v3nfbwPxq3A==
   dependencies:
     ansi-styles "^4.3.0"
 
@@ -1677,30 +1670,21 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/fs@^2.1.0", "@npmcli/fs@^2.1.1":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/git@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.2.tgz#5c5de6b4d70474cf2d09af149ce42e4e1dacb931"
-  integrity sha512-CAcd08y3DWBJqJDpfuVL0uijlq5oaXaOJEKHKc4wqrjd00gkvTZB+nFuLn+doOOKddaQS9JfqtNoFCO2LCvA3w==
+"@npmcli/git@^2.0.7", "@npmcli/git@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
-    "@npmcli/promise-spawn" "^3.0.0"
-    lru-cache "^7.4.4"
+    "@npmcli/promise-spawn" "^1.3.2"
+    lru-cache "^6.0.0"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^7.0.0"
-    proc-log "^2.0.0"
+    npm-pick-manifest "^6.1.1"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.7":
+"@npmcli/installed-package-contents@^1.0.6", "@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -1708,27 +1692,26 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-"@npmcli/map-workspaces@*", "@npmcli/map-workspaces@^2.0.2", "@npmcli/map-workspaces@^2.0.3":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz#9e5e8ab655215a262aefabf139782b894e0504fc"
-  integrity sha512-bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg==
+"@npmcli/map-workspaces@^1.0.2", "@npmcli/map-workspaces@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-1.0.4.tgz#915708b55afa25e20bc2c14a766c124c2c5d4cab"
+  integrity sha512-wVR8QxhyXsFcD/cORtJwGQodeeaDf0OxcHie8ema4VgFeqwYkFsDPnSrIRSytX8xR6nKPAH89WnwTcaU608b/Q==
   dependencies:
     "@npmcli/name-from-folder" "^1.0.1"
-    glob "^8.0.1"
-    minimatch "^5.0.1"
-    read-package-json-fast "^2.0.3"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+    read-package-json-fast "^2.0.1"
 
-"@npmcli/metavuln-calculator@^3.0.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622"
-  integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA==
+"@npmcli/metavuln-calculator@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz#2f95ff3c6d88b366dd70de1c3f304267c631b458"
+  integrity sha512-9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ==
   dependencies:
-    cacache "^16.0.0"
-    json-parse-even-better-errors "^2.3.1"
-    pacote "^13.0.3"
-    semver "^7.3.5"
+    cacache "^15.0.5"
+    pacote "^11.1.11"
+    semver "^7.3.2"
 
-"@npmcli/move-file@^1.0.1":
+"@npmcli/move-file@^1.0.1", "@npmcli/move-file@^1.1.0":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
@@ -1736,57 +1719,39 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/name-from-folder@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
   integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
 
-"@npmcli/node-gyp@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
-  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+"@npmcli/node-gyp@^1.0.1", "@npmcli/node-gyp@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
+  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
 
-"@npmcli/package-json@*", "@npmcli/package-json@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
-  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+"@npmcli/package-json@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-1.0.1.tgz#1ed42f00febe5293c3502fd0ef785647355f6e89"
+  integrity sha512-y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg==
   dependencies:
     json-parse-even-better-errors "^2.3.1"
 
-"@npmcli/promise-spawn@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
-  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
+  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/query@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-1.2.0.tgz#46468d583cf013aa92102970700f9555314aabe4"
-  integrity sha512-uWglsUM3PjBLgTSmZ3/vygeGdvWEIZ3wTUnzGFbprC/RtvQSaT+GAXu1DXmSFj2bD3oOZdcRm1xdzsV2z1YWdw==
+"@npmcli/run-script@^1.8.2", "@npmcli/run-script@^1.8.3", "@npmcli/run-script@^1.8.4", "@npmcli/run-script@^1.8.6":
+  version "1.8.6"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
+  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
   dependencies:
-    npm-package-arg "^9.1.0"
-    postcss-selector-parser "^6.0.10"
-    semver "^7.3.7"
-
-"@npmcli/run-script@*", "@npmcli/run-script@^4.1.0", "@npmcli/run-script@^4.1.3", "@npmcli/run-script@^4.2.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.2.1.tgz#c07c5c71bc1c70a5f2a06b0d4da976641609b946"
-  integrity sha512-7dqywvVudPSrRCW5nTHpHgeWnbBtz8cFkOuKrecm6ih+oO9ciydhWt6OF7HlqupRRmB8Q/gECVdB9LMfToJbRg==
-  dependencies:
-    "@npmcli/node-gyp" "^2.0.0"
-    "@npmcli/promise-spawn" "^3.0.0"
-    node-gyp "^9.0.0"
-    read-package-json-fast "^2.0.3"
-    which "^2.0.2"
+    "@npmcli/node-gyp" "^1.0.2"
+    "@npmcli/promise-spawn" "^1.3.2"
+    node-gyp "^7.1.0"
+    read-package-json-fast "^2.0.1"
 
 "@psychedelic/browser-rpc@2.1.0":
   version "2.1.0"
@@ -1941,11 +1906,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@types/babel__core@^7.1.14", "@types/babel__core@^7.1.7":
   version "7.1.19"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
@@ -2449,7 +2409,7 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@*, abbrev@1, abbrev@^1.0.0:
+abbrev@1, abbrev@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
@@ -2507,7 +2467,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.2.1:
+agentkeepalive@^4.1.3:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -2534,7 +2494,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2571,7 +2531,7 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   dependencies:
     type-fest "^0.21.3"
 
-ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
+ansi-regex@5.0.1, ansi-regex@^2.0.0, ansi-regex@^3.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -2605,12 +2565,12 @@ ansi-styles@^6.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.1.1.tgz#63cd61c72283a71cb30bd881dbb60adada74bc70"
   integrity sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg==
 
-ansicolors@*:
+ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
   integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
 
-ansistyles@*:
+ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
   integrity sha512-6QWEyvMgIXX0eO972y7YPBLSBsq7UWKFAoNNTLGaOJ9bstcEL9sCbcjf96dVfNDdUsRoGOK82vWFJlKApXds7g==
@@ -2631,16 +2591,16 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
 "aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 archiver-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
@@ -2670,19 +2630,27 @@ archiver@^5.3.0:
     tar-stream "^2.2.0"
     zip-stream "^4.1.0"
 
-archy@*:
+archy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2802,6 +2770,18 @@ asn1.js@^5.2.0:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
+asn1@~0.2.3:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
+  dependencies:
+    safer-buffer "~2.1.0"
+
+assert-plus@1.0.0, 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==
+
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -2845,6 +2825,11 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+attr-accept@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
+  integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==
+
 autoprefixer@^10.0.2:
   version "10.4.12"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.12.tgz#183f30bf0b0722af54ee5ef257f7d4320bb33129"
@@ -2857,6 +2842,16 @@ autoprefixer@^10.0.2:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
+
+aws4@^1.8.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+
 axe-core@^4.4.3:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f"
@@ -3672,6 +3667,13 @@ bash-path@^1.0.1:
     arr-union "^3.1.0"
     is-windows "^1.0.1"
 
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
+  dependencies:
+    tweetnacl "^0.14.3"
+
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -3689,17 +3691,17 @@ bignumber.js@^9.0.0:
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62"
   integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==
 
-bin-links@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.3.tgz#3842711ef3db2cd9f16a5f404a996a12db355a6e"
-  integrity sha512-zKdnMPWEdh4F5INR07/eBrodC7QrF5JKvqskjz/ZZRXg5YSAZIbn8zGhbhUrElzHBZ2fvEQdOU59RHcTG3GiwA==
+bin-links@^2.2.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-2.3.0.tgz#1ff241c86d2c29b24ae52f49544db5d78a4eb967"
+  integrity sha512-JzrOLHLwX2zMqKdyYZjkDgQGT+kHDkIhv2/IK2lJ00qLxV4TmFoHi8drDBb6H5Zrz1YfgHkai4e2MGPqnoUhqA==
   dependencies:
-    cmd-shim "^5.0.0"
+    cmd-shim "^4.0.1"
     mkdirp-infer-owner "^2.0.0"
-    npm-normalize-package-bin "^2.0.0"
-    read-cmd-shim "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
+    read-cmd-shim "^2.0.0"
     rimraf "^3.0.0"
-    write-file-atomic "^4.0.0"
+    write-file-atomic "^3.0.3"
 
 binary-extensions@^1.0.0:
   version "1.13.1"
@@ -3972,36 +3974,10 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
-builtins@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
-  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
-  dependencies:
-    semver "^7.0.0"
-
-cacache@*, cacache@^16.0.0, cacache@^16.1.0, cacache@^16.1.3:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
+builtins@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -4024,7 +4000,7 @@ cacache@^12.0.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.5:
+cacache@^15.0.3, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -4140,10 +4116,10 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-chalk@*:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.0.1.tgz#ca57d71e82bb534a296df63bbacc4a1c22b2a4b6"
-  integrity sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 chalk@^1.1.3:
   version "1.1.3"
@@ -4220,16 +4196,16 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@*, chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
 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==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -4245,12 +4221,12 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz#b28484fd436cbc267900364f096c9dc185efb251"
   integrity sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug==
 
-cidr-regex@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-4.0.2.tgz#ca8216d1761eed0bd9c4f5e8740f2d7363dd05bb"
-  integrity sha512-xvqVyyE8emYjipWVxsA+Vcsbt8TbJJsTHbOeMMA5qsmXUu5VZJzNBGwI4rr1IZ0FQI2z7bfry4NNACP5Cf67CA==
+cidr-regex@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-3.1.1.tgz#ba1972c57c66f61875f18fd7dd487469770b571d"
+  integrity sha512-RBqYd32aDwbCMFJRL6wHOlDNYJsPNTt8vC82ErHF5vKt8QQzxm1FrkW8s/R5pVrXMf17sba09Uoy91PKiddAsw==
   dependencies:
-    ip-regex "^5.0.0"
+    ip-regex "^4.1.0"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -4295,13 +4271,13 @@ clean-webpack-plugin@^3.0.0:
     "@types/webpack" "^4.4.31"
     del "^4.1.1"
 
-cli-columns@*:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-4.0.0.tgz#9fe4d65975238d55218c41bd2ed296a7fa555646"
-  integrity sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==
+cli-columns@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz#6732d972979efc2ae444a1f08e08fa139c96a18e"
+  integrity sha512-iQYpDgpPPmCjn534ikQOhi+ydP6uMar+DtJ6a0In4aGL/PKqWfao75s6eF81quQQaz7isGz+goNECLARRZswdg==
   dependencies:
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
+    string-width "^2.0.0"
+    strip-ansi "^3.0.1"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
@@ -4310,7 +4286,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@*:
+cli-table3@^0.6.0:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
   integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
@@ -4383,10 +4359,10 @@ clsx@^1.0.4, clsx@^1.1.1:
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
 
-cmd-shim@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
-  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+cmd-shim@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd"
+  integrity sha512-lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw==
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
@@ -4404,6 +4380,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4449,7 +4430,7 @@ color-string@1.5.5, color-string@^0.3.0, color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
+color-support@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -4481,15 +4462,15 @@ colors@1.4.0, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@*:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@~1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha512-rFl+iXVT1nhLQPfGDw+3WcS8rmm7XsLKUmhsGE3ihzzpIikeGrTaZPIRKYWeLsLBypsHzjXIvYEltVUZS84XxQ==
   dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
-combined-stream@^1.0.8:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4583,7 +4564,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -4663,6 +4644,11 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
+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==
+
 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"
@@ -5055,6 +5041,13 @@ damerau-levenshtein@^1.0.8:
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7"
   integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==
 
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
+  dependencies:
+    assert-plus "^1.0.0"
+
 data-urls@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -5235,7 +5228,7 @@ diff-sequences@^28.1.1:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
   integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
 
-diff@^5.1.0:
+diff@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
   integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
@@ -5400,6 +5393,14 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+ecc-jsbn@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
+  dependencies:
+    jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
+
 ed25519-hd-key@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ed25519-hd-key/-/ed25519-hd-key-1.3.0.tgz#e0bd2be4c07e15c753d5ed3aca30744e321b7c78"
@@ -5466,7 +5467,7 @@ encode-utf8@^1.0.3:
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-encoding@^0.1.13:
+encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -5986,6 +5987,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extensionizer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/extensionizer/-/extensionizer-1.0.1.tgz#504544239a7610ba8404b15c1832091a37768d09"
@@ -6016,6 +6022,16 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
+
+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==
+
 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"
@@ -6054,7 +6070,7 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fastest-levenshtein@*, fastest-levenshtein@^1.0.12:
+fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
@@ -6125,6 +6141,13 @@ file-loader@^6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
+file-selector@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc"
+  integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==
+  dependencies:
+    tslib "^2.4.0"
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -6280,6 +6303,11 @@ for-own@^0.1.3:
   dependencies:
     for-in "^1.0.1"
 
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
+
 form-data@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
@@ -6289,6 +6317,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 fraction.js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
@@ -6393,19 +6430,34 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
+    object-assign "^4.1.1"
+    signal-exit "^3.0.0"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
+    wide-align "^1.1.2"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6463,6 +6515,13 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
+  dependencies:
+    assert-plus "^1.0.0"
+
 glob-parent@5.1.2, glob-parent@^3.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -6475,18 +6534,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig==
 
-glob@*, glob@^8.0.1:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
-glob@^7.0.3, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -6570,11 +6618,24 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
-graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.8, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
+
+har-validator@~5.1.3:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
+  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
+  dependencies:
+    ajv "^6.12.3"
+    har-schema "^2.0.0"
+
 harmony-reflect@^1.4.6:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710"
@@ -6628,7 +6689,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.1:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
@@ -6730,12 +6791,12 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@*, hosted-git-info@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.1.0.tgz#9786123f92ef3627f24abc3f15c20d98ec4a6594"
-  integrity sha512-Ek+QmMEqZF8XrbFdwoDjSbm7rT23pCgEMOJmz6GPk/s4yH//RQfNPArhIxbguNxROq/+5lNBwCDHMhA903Kx1Q==
+hosted-git-info@^4.0.1, hosted-git-info@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
-    lru-cache "^7.5.1"
+    lru-cache "^6.0.0"
 
 hsl-regex@^1.0.0:
   version "1.0.0"
@@ -6818,14 +6879,14 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -6910,12 +6971,12 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==
 
-ignore-walk@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
-  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+ignore-walk@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
-    minimatch "^5.0.1"
+    minimatch "^3.0.4"
 
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
@@ -6999,28 +7060,28 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-ini@*, ini@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d"
-  integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==
-
 ini@^1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-init-package-json@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69"
-  integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A==
+ini@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
+
+init-package-json@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.5.tgz#78b85f3c36014db42d8f32117252504f68022646"
+  integrity sha512-u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA==
   dependencies:
-    npm-package-arg "^9.0.1"
+    npm-package-arg "^8.1.5"
     promzard "^0.3.0"
-    read "^1.0.7"
-    read-package-json "^5.0.0"
+    read "~1.0.1"
+    read-package-json "^4.1.1"
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
-    validate-npm-package-name "^4.0.0"
+    validate-npm-package-name "^3.0.0"
 
 internal-slot@^1.0.3:
   version "1.0.3"
@@ -7043,10 +7104,10 @@ invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
-ip-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-5.0.0.tgz#cd313b2ae9c80c07bd3851e12bf4fa4dc5480632"
-  integrity sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==
+ip-regex@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
+  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
 
 ip@^2.0.0:
   version "2.0.0"
@@ -7128,12 +7189,12 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@*:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-5.0.2.tgz#8805dce4ac503dcb3270aa7e8987fcc6f400fa58"
-  integrity sha512-cCaw4czL00EUoO+mbOt2cUSFq8DQ/3rfWw6foy48TI52+j/tKTtlUet14UnWryHfY9bNbpHLqXkd/jnF600PPQ==
+is-cidr@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-4.0.2.tgz#94c7585e4c6c77ceabf920f8cde51b8c0fda8814"
+  integrity sha512-z4a1ENUajDbEl/Q6/pVBpTR1nBjjEE1X7qb7bmWYanNnPoKAvUCPFKeXV6Fe4mgTkWKBqiHIcwsI3SndiO5FeA==
   dependencies:
-    cidr-regex "4.0.2"
+    cidr-regex "^3.1.1"
 
 is-color-stop@^1.0.0:
   version "1.1.0"
@@ -7147,7 +7208,7 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.5.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"
   integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
@@ -7215,6 +7276,18 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
+
 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"
@@ -7368,7 +7441,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -7422,6 +7495,11 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
+
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -8020,6 +8098,11 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
+
 jsconfig-paths-jest-mapper@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/jsconfig-paths-jest-mapper/-/jsconfig-paths-jest-mapper-1.0.0.tgz#cd8570e9f6eabb33890b27eb51bc7b6e91a8564e"
@@ -8082,7 +8165,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@*, json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   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==
@@ -8097,6 +8180,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8107,6 +8195,11 @@ json-stringify-nice@^1.1.4:
   resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
   integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
 
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
+
 json-text-sequence@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2"
@@ -8140,6 +8233,16 @@ jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
+jsprim@^1.2.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
+  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.4.0"
+    verror "1.10.0"
+
 jss-plugin-camel-case@^10.5.1:
   version "10.9.2"
   resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.2.tgz#76dddfa32f9e62d17daa4e3504991fd0933b89e1"
@@ -8223,15 +8326,15 @@ junk@^3.1.0:
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
-just-diff-apply@^5.2.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.4.1.tgz#1debed059ad009863b4db0e8d8f333d743cdd83b"
-  integrity sha512-AAV5Jw7tsniWwih8Ly3fXxEZ06y+6p5TwQMsw0dzZ/wPKilzyDgdAnL0Ug4NNIquPUOh1vfFWEHbmXUqM5+o8g==
+just-diff-apply@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-3.1.2.tgz#710d8cda00c65dc4e692df50dbe9bac5581c2193"
+  integrity sha512-TCa7ZdxCeq6q3Rgms2JCRHTCfWAETPZ8SzYUbkYF6KR3I03sN29DaOIC+xyWboIcMvjAsD5iG2u/RWzHD8XpgQ==
 
-just-diff@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.1.1.tgz#8da6414342a5ed6d02ccd64f5586cbbed3146202"
-  integrity sha512-u8HXJ3HlNrTzY7zrYYKjNEfBlyjqhdBkoyTVdjtn7p02RJD5NvR8rIClzeGA7t+UYP1/7eAkWNLU0+P3QrEqKQ==
+just-diff@^3.0.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-3.1.1.tgz#d50c597c6fd4776495308c63bdee1b6839082647"
+  integrity sha512-sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ==
 
 keycode@^2.1.7:
   version "2.2.1"
@@ -8337,118 +8440,115 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libnpmaccess@*:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.4.tgz#2dd158bd8a071817e2207d3b201d37cf1ad6ae6b"
-  integrity sha512-qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag==
+libnpmaccess@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+  integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
 
-libnpmdiff@*:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-4.0.5.tgz#ffaf93fa9440ea759444b8830fdb5c661b09a7c0"
-  integrity sha512-9fICQIzmH892UwHHPmb+Seup50UIBWcMIK2FdxvlXm9b4kc1nSH0b/BuY1mORJQtB6ydPMnn+BLzOTmd/SKJmw==
+libnpmdiff@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmdiff/-/libnpmdiff-2.0.4.tgz#bb1687992b1a97a8ea4a32f58ad7c7f92de53b74"
+  integrity sha512-q3zWePOJLHwsLEUjZw3Kyu/MJMYfl4tWCg78Vl6QGSfm4aXBUSVzMzjJ6jGiyarsT4d+1NH4B1gxfs62/+y9iQ==
   dependencies:
-    "@npmcli/disparity-colors" "^2.0.0"
+    "@npmcli/disparity-colors" "^1.0.1"
     "@npmcli/installed-package-contents" "^1.0.7"
     binary-extensions "^2.2.0"
-    diff "^5.1.0"
-    minimatch "^5.0.1"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    diff "^5.0.0"
+    minimatch "^3.0.4"
+    npm-package-arg "^8.1.1"
+    pacote "^11.3.0"
     tar "^6.1.0"
 
-libnpmexec@*:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-4.0.13.tgz#6688bd6c02cac31a32d2e56680c3884948cbf453"
-  integrity sha512-MGi6eD6zqZ1V8VCJenWRc2+rWaFiW/Vkr5Aa/cQAd3duWNvXen9sm101M6ww5ER5PmsT+qX2aZOA3A9ZPfJQXg==
+libnpmexec@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-2.0.1.tgz#729ae3e15a3ba225964ccf248117a75d311eeb73"
+  integrity sha512-4SqBB7eJvJWmUKNF42Q5qTOn20DRjEE4TgvEh2yneKlAiRlwlhuS9MNR45juWwmoURJlf2K43bozlVt7OZiIOw==
   dependencies:
-    "@npmcli/arborist" "^5.6.2"
-    "@npmcli/ci-detect" "^2.0.0"
-    "@npmcli/fs" "^2.1.1"
-    "@npmcli/run-script" "^4.2.0"
+    "@npmcli/arborist" "^2.3.0"
+    "@npmcli/ci-detect" "^1.3.0"
+    "@npmcli/run-script" "^1.8.4"
     chalk "^4.1.0"
     mkdirp-infer-owner "^2.0.0"
-    npm-package-arg "^9.0.1"
-    npmlog "^6.0.2"
-    pacote "^13.6.1"
-    proc-log "^2.0.0"
+    npm-package-arg "^8.1.2"
+    pacote "^11.3.1"
+    proc-log "^1.0.0"
     read "^1.0.7"
     read-package-json-fast "^2.0.2"
-    semver "^7.3.7"
     walk-up-path "^1.0.0"
 
-libnpmfund@*:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-3.0.4.tgz#be1fd46bcfa9432660f98d935135d7ee3e620239"
-  integrity sha512-azKUVFkL27AsvzEzLKMHX/L8j/GE2TL6eZ6KIdc9hsvleoNLT+Y6XO9w9v7JWwg03smZK9dbqwvnYZzO3vzrIA==
+libnpmfund@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libnpmfund/-/libnpmfund-1.1.0.tgz#ee91313905b3194b900530efa339bc3f9fc4e5c4"
+  integrity sha512-Kfmh3pLS5/RGKG5WXEig8mjahPVOxkik6lsbH4iX0si1xxNi6eeUh/+nF1MD+2cgalsQif3O5qyr6mNz2ryJrQ==
   dependencies:
-    "@npmcli/arborist" "^5.6.2"
+    "@npmcli/arborist" "^2.5.0"
 
-libnpmhook@*:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-8.0.4.tgz#6c58e5fe763ff5d600ae9c20457ea9a69d1f7d87"
-  integrity sha512-nuD6e+Nx0OprjEi0wOeqASMl6QIH235th/Du2/8upK3evByFhzIgdfOeP1OhstavW4xtsl0hk5Vw4fAWWuSUgA==
+libnpmhook@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-6.0.3.tgz#1d7f0d7e6a7932fbf7ce0881fdb0ed8bf8748a30"
+  integrity sha512-3fmkZJibIybzmAvxJ65PeV3NzRc0m4xmYt6scui5msocThbEp4sKFT80FhgrCERYDjlUuFahU6zFNbJDHbQ++g==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmorg@*:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-4.0.4.tgz#2a01d49372cf0df90d79a61e69bddaf2ed704311"
-  integrity sha512-1bTpD7iub1rDCsgiBguhJhiDufLQuc8DEti20euqsXz9O0ncXVpCYqf2SMmHR4GEdmAvAj2r7FMiyA9zGdaTpA==
+libnpmorg@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-2.0.3.tgz#4e605d4113dfa16792d75343824a0625c76703bc"
+  integrity sha512-JSGl3HFeiRFUZOUlGdiNcUZOsUqkSYrg6KMzvPZ1WVZ478i47OnKSS0vkPmX45Pai5mTKuwIqBMcGWG7O8HfdA==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmpack@*:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-4.1.3.tgz#025cfe39829acd8260662bf259e3a9331fc1e4b2"
-  integrity sha512-rYP4X++ME3ZiFO+2iN3YnXJ4LB4Gsd0z5cgszWJZxaEpDN4lRIXirSyynGNsN/hn4taqnlxD+3DPlFDShvRM8w==
+libnpmpack@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmpack/-/libnpmpack-2.0.1.tgz#d3eac25cc8612f4e7cdeed4730eee339ba51c643"
+  integrity sha512-He4/jxOwlaQ7YG7sIC1+yNeXeUDQt8RLBvpI68R3RzPMZPa4/VpxhlDo8GtBOBDYoU8eq6v1wKL38sq58u4ibQ==
   dependencies:
-    "@npmcli/run-script" "^4.1.3"
-    npm-package-arg "^9.0.1"
-    pacote "^13.6.1"
+    "@npmcli/run-script" "^1.8.3"
+    npm-package-arg "^8.1.0"
+    pacote "^11.2.6"
 
-libnpmpublish@*:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.5.tgz#5a894f3de2e267d62f86be2a508e362599b5a4b1"
-  integrity sha512-LUR08JKSviZiqrYTDfywvtnsnxr+tOvBU0BF8H+9frt7HMvc6Qn6F8Ubm72g5hDTHbq8qupKfDvDAln2TVPvFg==
+libnpmpublish@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+  integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
   dependencies:
-    normalize-package-data "^4.0.0"
-    npm-package-arg "^9.0.1"
-    npm-registry-fetch "^13.0.0"
-    semver "^7.3.7"
-    ssri "^9.0.0"
+    normalize-package-data "^3.0.2"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^11.0.0"
+    semver "^7.1.3"
+    ssri "^8.0.1"
 
-libnpmsearch@*:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-5.0.4.tgz#b32aa2b23051c00cdcc0912274d0d416e6655d81"
-  integrity sha512-XHDmsvpN5+pufvGnfLRqpy218gcGGbbbXR6wPrDJyd1em6agKdYByzU5ccskDHH9iVm2UeLydpDsW1ksYuU0cg==
+libnpmsearch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-3.1.2.tgz#aee81b9e4768750d842b627a3051abc89fdc15f3"
+  integrity sha512-BaQHBjMNnsPYk3Bl6AiOeVuFgp72jviShNBw5aHaHNKWqZxNi38iVNoXbo6bG/Ccc/m1To8s0GtMdtn6xZ1HAw==
   dependencies:
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmteam@*:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-4.0.4.tgz#ac26068808d93b1051d926457db14e4b3ff669ef"
-  integrity sha512-rzKSwi6MLzwwevbM/vl+BBQTErgn24tCfgPUdzBlszrw3j5necOu7WnTzgvZMDv6maGUwec6Ut1rxszOgH0l+Q==
+libnpmteam@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-2.0.4.tgz#9dbe2e18ae3cb97551ec07d2a2daf9944f3edc4c"
+  integrity sha512-FPrVJWv820FZFXaflAEVTLRWZrerCvfe7ZHSMzJ/62EBlho2KFlYKjyNEsPW3JiV7TLSXi3vo8u0gMwIkXSMTw==
   dependencies:
     aproba "^2.0.0"
-    npm-registry-fetch "^13.0.0"
+    npm-registry-fetch "^11.0.0"
 
-libnpmversion@*:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-3.0.7.tgz#e4c6c07ee28cf351ce1e2293a5ac9922b09ea94d"
-  integrity sha512-O0L4eNMUIMQ+effi1HsZPKp2N6wecwqGqB8PvkvmLPWN7EsdabdzAVG48nv0p/OjlbIai5KQg/L+qMMfCA4ZjA==
+libnpmversion@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libnpmversion/-/libnpmversion-1.2.1.tgz#689aa7fe0159939b3cbbf323741d34976f4289e9"
+  integrity sha512-AA7x5CFgBFN+L4/JWobnY5t4OAHjQuPbAwUYJ7/NtHuyLut5meb+ne/aj0n7PWNiTGCJcRw/W6Zd2LoLT7EZuQ==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/run-script" "^4.1.3"
+    "@npmcli/git" "^2.0.7"
+    "@npmcli/run-script" "^1.8.4"
     json-parse-even-better-errors "^2.3.1"
-    proc-log "^2.0.0"
-    semver "^7.3.7"
+    semver "^7.3.5"
+    stringify-package "^1.0.1"
 
 lilconfig@2.0.5:
   version "2.0.5"
@@ -8658,11 +8758,6 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
-  version "7.14.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
-  integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
-
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -8678,27 +8773,27 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
-make-fetch-happen@*, make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
+make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
   dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
     http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
+    http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
     minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
+    minipass-fetch "^1.3.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
+    negotiator "^0.6.2"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
 
 makeerror@1.0.12:
   version "1.0.12"
@@ -8813,7 +8908,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8856,7 +8951,7 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
@@ -8875,16 +8970,16 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
   dependencies:
-    minipass "^3.1.6"
+    minipass "^3.1.0"
     minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
+    minizlib "^2.0.0"
   optionalDependencies:
-    encoding "^0.1.13"
+    encoding "^0.1.12"
 
 minipass-flush@^1.0.5:
   version "1.0.5"
@@ -8901,7 +8996,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@*, minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -8915,14 +9010,14 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@*, minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
   integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -8967,7 +9062,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
+mkdirp-infer-owner@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316"
   integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw==
@@ -8976,11 +9071,6 @@ mkdirp-infer-owner@*, mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -8988,6 +9078,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 moment@^2.29.1:
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -9005,11 +9100,6 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-ms@*, ms@^2.0.0, ms@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -9020,6 +9110,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 mute-stream@~0.0.4:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -9057,7 +9152,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@^0.6.3:
+negotiator@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9114,20 +9209,20 @@ node-gyp-build@^4.2.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40"
   integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==
 
-node-gyp@*, node-gyp@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8"
-  integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g==
+node-gyp@^7.1.0, node-gyp@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
+  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
+    graceful-fs "^4.2.3"
     nopt "^5.0.0"
-    npmlog "^6.0.0"
+    npmlog "^4.1.2"
+    request "^2.88.2"
     rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
+    semver "^7.3.2"
+    tar "^6.0.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -9169,13 +9264,6 @@ node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-nopt@*, nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -9183,15 +9271,15 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c"
-  integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
-    hosted-git-info "^5.0.0"
-    is-core-module "^2.8.1"
-    semver "^7.3.5"
-    validate-npm-package-license "^3.0.4"
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
   version "2.1.1"
@@ -9215,10 +9303,10 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-audit-report@*:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-3.0.0.tgz#1bf3e531208b5f77347c8d00c3d9badf5be30cd6"
-  integrity sha512-tWQzfbwz1sc4244Bx2BVELw0EmZlCsCF0X93RDcmmwhonCsPMoEviYsi+32R+mdRvOWXolPce9zo64n2xgPESw==
+npm-audit-report@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw==
   dependencies:
     chalk "^4.0.0"
 
@@ -9229,80 +9317,65 @@ npm-bundled@^1.1.1:
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-bundled@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-2.0.1.tgz#94113f7eb342cd7a67de1e789f896b04d2c600f4"
-  integrity sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==
-  dependencies:
-    npm-normalize-package-bin "^2.0.0"
-
-npm-install-checks@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
-  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
+npm-install-checks@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
+  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
   dependencies:
     semver "^7.1.1"
 
-npm-normalize-package-bin@^1.0.1:
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-normalize-package-bin@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff"
-  integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==
+npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
+    validate-npm-package-name "^3.0.0"
 
-npm-package-arg@*, npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
-  integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
+npm-packlist@^2.1.4:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
-    hosted-git-info "^5.0.0"
-    proc-log "^2.0.1"
-    semver "^7.3.5"
-    validate-npm-package-name "^4.0.0"
-
-npm-packlist@^5.1.0:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b"
-  integrity sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==
-  dependencies:
-    glob "^8.0.1"
-    ignore-walk "^5.0.1"
-    npm-bundled "^2.0.0"
-    npm-normalize-package-bin "^2.0.0"
-
-npm-pick-manifest@*, npm-pick-manifest@^7.0.0, npm-pick-manifest@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.2.tgz#1d372b4e7ea7c6712316c0e99388a73ed3496e84"
-  integrity sha512-gk37SyRmlIjvTfcYl6RzDbSmS9Y4TOBXfsPnoYqTHARNgWbyDiCSMLUpmALDj4jjcTZpURiEfsSHJj9k7EV4Rw==
-  dependencies:
-    npm-install-checks "^5.0.0"
-    npm-normalize-package-bin "^2.0.0"
-    npm-package-arg "^9.0.0"
-    semver "^7.3.5"
+    glob "^7.1.6"
+    ignore-walk "^3.0.3"
+    npm-bundled "^1.1.1"
+    npm-normalize-package-bin "^1.0.1"
 
-npm-profile@*:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-6.2.1.tgz#975c31ec75a6ae029ab5b8820ffdcbae3a1e3d5e"
-  integrity sha512-Tlu13duByHyDd4Xy0PgroxzxnBYWbGGL5aZifNp8cx2DxUrHSoETXtPKg38aRPsBWMRfDtvcvVfJNasj7oImQQ==
+npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.0, npm-pick-manifest@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
+  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
   dependencies:
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    npm-install-checks "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^8.1.2"
+    semver "^7.3.4"
+
+npm-profile@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-5.0.4.tgz#73e5bd1d808edc2c382d7139049cc367ac43161b"
+  integrity sha512-OKtU7yoAEBOnc8zJ+/uo5E4ugPp09sopo+6y1njPp+W99P8DvQon3BJYmpvyK2Bf1+3YV5LN1bvgXRoZ1LUJBA==
+  dependencies:
+    npm-registry-fetch "^11.0.0"
 
-npm-registry-fetch@*, npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
-  version "13.3.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e"
-  integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw==
+npm-registry-fetch@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
   dependencies:
-    make-fetch-happen "^10.0.6"
-    minipass "^3.1.6"
-    minipass-fetch "^2.0.3"
+    make-fetch-happen "^9.0.1"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
-    minizlib "^2.1.2"
-    npm-package-arg "^9.0.1"
-    proc-log "^2.0.0"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -9325,7 +9398,7 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-npm-user-validate@*:
+npm-user-validate@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
   integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
@@ -9404,14 +9477,24 @@ npm@7.22.0:
     which "^2.0.2"
     write-file-atomic "^3.0.3"
 
-npmlog@*, npmlog@^6.0.0, npmlog@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
-    are-we-there-yet "^3.0.0"
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+npmlog@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
+  dependencies:
+    are-we-there-yet "^2.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.3"
+    gauge "^3.0.0"
     set-blocking "^2.0.0"
 
 nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
@@ -9421,11 +9504,21 @@ nth-check@2.0.1, nth-check@^1.0.2, nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
+
 nwsapi@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
   integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -9540,7 +9633,7 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-opener@*:
+opener@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
@@ -9684,32 +9777,30 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pacote@*, pacote@^13.0.3, pacote@^13.6.1:
-  version "13.6.2"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a"
-  integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg==
+pacote@^11.1.11, pacote@^11.2.6, pacote@^11.3.0, pacote@^11.3.1, pacote@^11.3.5:
+  version "11.3.5"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
+  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
   dependencies:
-    "@npmcli/git" "^3.0.0"
-    "@npmcli/installed-package-contents" "^1.0.7"
-    "@npmcli/promise-spawn" "^3.0.0"
-    "@npmcli/run-script" "^4.1.0"
-    cacache "^16.0.0"
+    "@npmcli/git" "^2.1.0"
+    "@npmcli/installed-package-contents" "^1.0.6"
+    "@npmcli/promise-spawn" "^1.2.0"
+    "@npmcli/run-script" "^1.8.2"
+    cacache "^15.0.5"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.6"
-    mkdirp "^1.0.4"
-    npm-package-arg "^9.0.0"
-    npm-packlist "^5.1.0"
-    npm-pick-manifest "^7.0.0"
-    npm-registry-fetch "^13.0.1"
-    proc-log "^2.0.0"
+    minipass "^3.1.3"
+    mkdirp "^1.0.3"
+    npm-package-arg "^8.0.1"
+    npm-packlist "^2.1.4"
+    npm-pick-manifest "^6.0.0"
+    npm-registry-fetch "^11.0.0"
     promise-retry "^2.0.1"
-    read-package-json "^5.0.0"
-    read-package-json-fast "^2.0.3"
+    read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
+    ssri "^8.0.1"
+    tar "^6.1.0"
 
 pako@~1.0.5:
   version "1.0.11"
@@ -9751,14 +9842,14 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-conflict-json@*, parse-conflict-json@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
-  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+parse-conflict-json@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz#54ec175bde0f2d70abf6be79e0e042290b86701b"
+  integrity sha512-4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw==
   dependencies:
-    json-parse-even-better-errors "^2.3.1"
-    just-diff "^5.0.1"
-    just-diff-apply "^5.2.0"
+    json-parse-even-better-errors "^2.3.0"
+    just-diff "^3.0.1"
+    just-diff-apply "^3.0.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -9882,6 +9973,11 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -10246,7 +10342,7 @@ postcss-selector-parser@^3.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
@@ -10355,10 +10451,10 @@ private@^0.1.6:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-proc-log@^2.0.0, proc-log@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
-  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+proc-log@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-1.0.0.tgz#0d927307401f69ed79341e83a0b2c9a13395eb77"
+  integrity sha512-aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg==
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
@@ -10449,7 +10545,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
-psl@^1.1.33:
+psl@^1.1.28, psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -10534,7 +10630,7 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
-qrcode-terminal@*:
+qrcode-terminal@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
   integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
@@ -10549,6 +10645,11 @@ qrcode@^1.4.4:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
+qs@~6.5.2:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
+  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
+
 query-string@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-7.1.1.tgz#754620669db978625a90f635f12617c271a088e1"
@@ -10625,6 +10726,15 @@ react-dom@^17.0.1:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
+react-dropzone@^14.2.2:
+  version "14.2.2"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.2.tgz#a75a0676055fe9e2cb78578df4dedb4c42b54f98"
+  integrity sha512-5oyGN/B5rNhop2ggUnxztXBQ6q6zii+OMEftPzsxAR2hhpVWz0nAV+3Ktxo2h5bZzdcCKrpd8bfWAVsveIBM+w==
+  dependencies:
+    attr-accept "^2.2.2"
+    file-selector "^0.6.0"
+    prop-types "^15.8.1"
+
 react-event-listener@^0.6.0:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.6.tgz#758f7b991cad9086dd39fd29fad72127e1d8962a"
@@ -10786,12 +10896,12 @@ react@^17.0.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-read-cmd-shim@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.1.tgz#868c235ec59d1de2db69e11aec885bc095aea087"
-  integrity sha512-kEmDUoYf/CDy8yZbLTmhB1X9kkjf9Q80PCNsDMb7ufrGd6zZSQA1+UyjrO+pZm5K/S4OXCWJeiIt1JA8kAsa6g==
+read-cmd-shim@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
+  integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
+read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10799,24 +10909,24 @@ read-package-json-fast@*, read-package-json-fast@^2.0.2, read-package-json-fast@
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@*, read-package-json@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa"
-  integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q==
+read-package-json@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-4.1.2.tgz#b444d047de7c75d4a160cb056d00c0693c1df703"
+  integrity sha512-Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ==
   dependencies:
-    glob "^8.0.1"
-    json-parse-even-better-errors "^2.3.1"
-    normalize-package-data "^4.0.0"
-    npm-normalize-package-bin "^2.0.0"
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^3.0.0"
+    npm-normalize-package-bin "^1.0.0"
 
-read@*, read@1, read@^1.0.7:
+read@1, read@^1.0.7, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4"
   integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   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==
@@ -10858,7 +10968,7 @@ readdir-glob@^1.0.0:
   dependencies:
     minimatch "^5.1.0"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -11059,6 +11169,32 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
+request@^2.88.2:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -11209,7 +11345,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha512-zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg==
 
-rimraf@*, rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -11283,7 +11419,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -11359,13 +11495,6 @@ secp256k1@^4.0.0, secp256k1@^4.0.2:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-semver@*, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -11376,6 +11505,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -11390,7 +11526,7 @@ serialize-javascript@^5.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -11563,10 +11699,10 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+socks-proxy-agent@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
+  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
   dependencies:
     agent-base "^6.0.2"
     debug "^4.3.3"
@@ -11694,12 +11830,20 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-ssri@*, ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
+sshpk@^1.7.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
+  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
+    ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
+    jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
+    tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
   version "6.0.2"
@@ -11708,7 +11852,7 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -11785,6 +11929,15 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11794,6 +11947,14 @@ string-length@^4.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
 string-width@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -11856,6 +12017,11 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -11863,6 +12029,13 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -12043,7 +12216,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@*, tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12131,7 +12304,7 @@ text-encoding@^0.7.0:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
   integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==
 
-text-table@*, 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 sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
@@ -12161,7 +12334,7 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
-tiny-relative-date@*:
+tiny-relative-date@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
@@ -12240,6 +12413,14 @@ tough-cookie@^4.0.0:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -12257,10 +12438,10 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-treeverse@*, treeverse@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
-  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+treeverse@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"
+  integrity sha512-whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g==
 
 tsconfig-paths@^3.14.1:
   version "3.14.1"
@@ -12272,7 +12453,7 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0:
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
@@ -12282,11 +12463,23 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 tweetnacl@1.0.3, tweetnacl@^1.0.1, tweetnacl@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -12411,13 +12604,6 @@ unique-filename@^1.1.1:
   dependencies:
     unique-slug "^2.0.0"
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
 unique-slug@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
@@ -12425,13 +12611,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
@@ -12580,6 +12759,11 @@ uuid@8.3.2, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuidv4@^6.2.13:
   version "6.2.13"
   resolved "https://registry.yarnpkg.com/uuidv4/-/uuidv4-6.2.13.tgz#8f95ec5ef22d1f92c8e5d4c70b735d1c89572cb7"
@@ -12602,7 +12786,7 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
 
-validate-npm-package-license@^3.0.4:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
@@ -12610,18 +12794,27 @@ validate-npm-package-license@^3.0.4:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validate-npm-package-name@*, validate-npm-package-name@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
-  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==
   dependencies:
-    builtins "^5.0.0"
+    builtins "^1.0.3"
 
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -12864,13 +13057,6 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
-which@*, which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^1.2.12, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -12878,7 +13064,14 @@ which@^1.2.12, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.5:
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0, wide-align@^1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -12925,15 +13118,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@*, write-file-atomic@^4.0.0, write-file-atomic@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
-write-file-atomic@^3.0.0:
+write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
   integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
@@ -12943,6 +13128,14 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+write-file-atomic@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 ws@8.5.0:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"

From 5aac24c03b97166df8d877be200922e5bea45d8e Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Thu, 29 Sep 2022 21:55:54 -0600
Subject: [PATCH 071/132] Installed controller v 0.22.1 and Fixed issue with
 ICNS collection.

---
 package.json                                      |  2 +-
 source/views/Extension/Views/NFTDetails/index.jsx |  2 +-
 yarn.lock                                         | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index e3dccc13..e8452b15 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.11",
-    "@psychedelic/plug-controller": "../plug-controller",
+    "@psychedelic/plug-controller": "0.22.1",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/views/Extension/Views/NFTDetails/index.jsx b/source/views/Extension/Views/NFTDetails/index.jsx
index d4543519..5df72c39 100644
--- a/source/views/Extension/Views/NFTDetails/index.jsx
+++ b/source/views/Extension/Views/NFTDetails/index.jsx
@@ -53,7 +53,7 @@ const NFTDetails = () => {
     [collections, populatedNFT]);
 
   const name = `${populatedNFT?.name ?? `#${populatedNFT?.index}`}`;
-  const isICNS = collection === 'ICNS';
+  const isICNS = collection?.name === 'ICNS';
 
   const openNFT = (url) => {
     const parsedUrl = isICNS
diff --git a/yarn.lock b/yarn.lock
index f9a1834d..f656c7c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1801,12 +1801,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@../plug-controller":
-<<<<<<< HEAD
-  version "0.23.0"
-=======
-  version "0.21.1"
->>>>>>> 6c1b884af215c458baafe75b929c38e456e1a3a7
+"@psychedelic/plug-controller@0.22.1":
+  version "0.22.1"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.1/23ee87e5495dbb8f5d66683faa3b53c0dab0703f#23ee87e5495dbb8f5d66683faa3b53c0dab0703f"
+  integrity sha512-F3tlcIMiFgZb9fpIwgc35iZnjk9GI6s44G0QjLG/EgCbEDU11tiRhr+aC7IMKzSujnW6ci4Csh3HFJC/+X9nPw==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From a03f7b9ce5657287ffcf840c2e28eb2dd9c0c388 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Fri, 30 Sep 2022 15:02:49 -0300
Subject: [PATCH 072/132] can read .pem file

---
 .../Views/ImportWallet/Steps/Step1.jsx        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 4e03a9df..17881f42 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -14,16 +14,25 @@ const Step1 = ({handleChangeStep}) => {
 
   const [loading, setLoading] = useState(false);
   const [disabled, setDisabled] = useState(false);
-  
-  const onDrop = useCallback(acceptedFiles => {
-    console.log(acceptedFiles);
-  }, [])
+
+  const onDrop = useCallback(acceptedFile => {
+    let fileReader = new FileReader();
+    fileReader.readAsText(acceptedFile[0]);
+    fileReader.onloadend = () => {
+      const content = fileReader.result;
+      console.log(content);
+    };
+  }, []);
 
   const {
     getRootProps,
     getInputProps,
     isDragActive,
-  } = useDropzone({ onDrop });
+  } = useDropzone({ onDrop,
+    maxFiles: 1,
+    accept: {
+    'application/x-pem-file': ['.pem'],
+  } });
 
   return (
     <Container>

From b1fbb224075d968ac5b84d6f69d51323c3be783c Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Fri, 30 Sep 2022 12:09:27 -0600
Subject: [PATCH 073/132] Installed controller and dabjs with icp standard
 fixes

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

diff --git a/package.json b/package.json
index 3f8833a5..f0bdfc10 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
     "@material-ui/icons": "^4.11.2",
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
-    "@psychedelic/dab-js": "1.4.11",
-    "@psychedelic/plug-controller": "0.21.0",
+    "@psychedelic/dab-js": "1.4.12",
+    "@psychedelic/plug-controller": "0.22.2",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index e46fd908..9783c6d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1773,10 +1773,10 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js@1.4.10":
-  version "1.4.10"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.10/ab2728aa672012b6889bbfc2730e63149517e965#ab2728aa672012b6889bbfc2730e63149517e965"
-  integrity sha512-OBVif7y1qAk4ZPeB7bEeQGbDgUuNpwndGU86N8dNsoAmrgrHpNb47DGHnH9Rs6KG7fPMBnNed15BUBzCRVKR2Q==
+"@psychedelic/dab-js@1.4.12":
+  version "1.4.12"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.12/ee252e693f8606327f479cbbdbfe8424b422e8f5#ee252e693f8606327f479cbbdbfe8424b422e8f5"
+  integrity sha512-oJwMbgafesO5KOBoV70oQ929wel18n0X6u/IBtR7mcBa0SdwM2uyhbgjNqVLpFdBaVBRoAxKdCABc4sVRcqglg==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1787,31 +1787,17 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/dab-js@1.4.11":
-  version "1.4.11"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.11/e6800b2304edc64299407ec32f5749b1f30ec60b#e6800b2304edc64299407ec32f5749b1f30ec60b"
-  integrity sha512-lWNRBSbJCjDKOG+xNwcL809TUguoJM8jGhPlxhIBwoy5u2RZrMcMQ7DmlpKkUsXqi5VGEiP25Ud23pPPjejc+w==
-  dependencies:
-    "@dfinity/agent" "0.9.3"
-    "@dfinity/candid" "0.9.3"
-    "@dfinity/identity" "0.9.3"
-    "@dfinity/principal" "0.9.3"
-    axios "^0.24.0"
-    buffer-crc32 "^0.2.13"
-    cross-fetch "^3.1.4"
-    crypto-js "^4.1.1"
-
-"@psychedelic/plug-controller@0.21.0":
-  version "0.21.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.0/48e547f647bcbd1723cd4536688bf07811b15ee7#48e547f647bcbd1723cd4536688bf07811b15ee7"
-  integrity sha512-L/Jkrl7tjIosZth1IKj5d0m+pTbsB+y1LgFRpI1LJsXEoWbgzEjwsesgeN5BvNNbqW+SMPTPcUusk+Fug6WaFA==
+"@psychedelic/plug-controller@0.22.2":
+  version "0.22.2"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.2/3649bd743783f92da34172b0e51cdc12144f829f#3649bd743783f92da34172b0e51cdc12144f829f"
+  integrity sha512-csZn2lYklXMBiUBBqDE9GO885rwvXf2vZe9jz3biGzVgoeJaLks2/fbcRCN0zopsAtxVeyFCUMWwS7yvHKERKw==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.10"
+    "@psychedelic/dab-js" "1.4.12"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"

From 3fa170c592bd7e34f9c56f8317ca1983b2b24cde Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 3 Oct 2022 17:41:12 -0300
Subject: [PATCH 074/132] merged with a local branch for test react-dropzone
 package

---
 .../Views/ImportWallet/Steps/Step1.jsx        | 111 +++++++++++-------
 .../Views/ImportWallet/hooks/useSteps.jsx     |   6 +-
 .../Extension/Views/ImportWallet/styles.js    |   1 +
 3 files changed, 74 insertions(+), 44 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 17881f42..405a9732 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -1,67 +1,92 @@
-import { Container, Button } from '@components'
-import React, { useState, useCallback } from 'react'
-import DragDropBox from '../components/DragDropBox';
-import { useTranslation } from 'react-i18next';
-import { useDropzone } from 'react-dropzone';
-import useStyles from '../styles';
-import { CloudUpload } from '@material-ui/icons';
-import { Typography, Grid } from '@material-ui/core';
+import { Container, Button } from "@components";
+import React, { useState, useCallback, useEffect } from "react";
+import DragDropBox from "../components/DragDropBox";
+import { useTranslation } from "react-i18next";
+import { useDropzone } from "react-dropzone";
+import useStyles from "../styles";
+import { CloudUpload } from "@material-ui/icons";
+import GradientFile from "@assets/icons/gradient-file.svg";
+import { Typography, Grid } from "@material-ui/core";
 import { Plug } from "@components";
+import CloseIcon from "@material-ui/icons/Close";
 
-const Step1 = ({handleChangeStep}) => {
+const Step1 = ({ handleChangeStep, setUserPemFile, userPemFile }) => {
   const { t } = useTranslation();
   const classes = useStyles();
 
   const [loading, setLoading] = useState(false);
   const [disabled, setDisabled] = useState(false);
 
-  const onDrop = useCallback(acceptedFile => {
-    let fileReader = new FileReader();
-    fileReader.readAsText(acceptedFile[0]);
-    fileReader.onloadend = () => {
-      const content = fileReader.result;
-      console.log(content);
-    };
+  const handleRemoveFile = () => {
+    setUserPemFile(null);
+  };
+
+  const onDrop = useCallback((acceptedFile) => {
+    setUserPemFile(acceptedFile[0]);
   }, []);
 
-  const {
-    getRootProps,
-    getInputProps,
-    isDragActive,
-  } = useDropzone({ onDrop,
+  const { getRootProps, getInputProps, isDragActive } = useDropzone({
+    onDrop,
     maxFiles: 1,
     accept: {
-    'application/x-pem-file': ['.pem'],
-  } });
+      "application/x-pem-file": [".pem"],
+    },
+  });
 
   return (
     <Container>
       <Grid container spacing={2}>
         <Grid item xs={12}>
           <div className={classes.dragDropContainer} {...getRootProps()}>
-            {
-              isDragActive ? (
-                <div className={classes.dropItContainer}>
-                  <Plug size="small" /> 
-                  <span className={classes.dropItLabel}>
-                    {t('importPem.dropIt')}
-                  </span>
+            {userPemFile ? (
+              <>
+                <img src={GradientFile} alt="gradientFile" />
+                <div className={classes.nameXIcon}>
+                  <Typography variant="h5">{userPemFile.name || ""}</Typography>
+                  <CloseIcon
+                    className={classes.icon}
+                    onClick={() => handleRemoveFile()}
+                  />
                 </div>
-              ) : (
-                <>
-                <input {...getInputProps()} /><CloudUpload style={{ color: '#BBBEC2' }} fontSize='large' /><Typography className={classes.dragDropText} variant='h6'>
-                    {t('importPem.dragAndDrop')}<br />
-                    {t('importPem.or')} <label className={classes.inputFileLabel} id="label-file-upload" htmlFor="input-file-upload">{t('importPem.browse')}</label>
-                  </Typography>
-                </>
-              )
-            }
+              </>
+            ) : (
+              <>
+                {isDragActive ? (
+                  <div className={classes.dropItContainer}>
+                    <Plug size="small" />
+                    <span className={classes.dropItLabel}>
+                      {t("importPem.dropIt")}
+                    </span>
+                  </div>
+                ) : (
+                  <>
+                    <input {...getInputProps()} />
+                    <CloudUpload
+                      style={{ color: "#BBBEC2" }}
+                      fontSize="large"
+                    />
+                    <Typography className={classes.dragDropText} variant="h6">
+                      {t("importPem.dragAndDrop")}
+                      <br />
+                      {t("importPem.or")}{" "}
+                      <label
+                        className={classes.inputFileLabel}
+                        id="label-file-upload"
+                        htmlFor="input-file-upload"
+                      >
+                        {t("importPem.browse")}
+                      </label>
+                    </Typography>
+                  </>
+                )}
+              </>
+            )}
           </div>
         </Grid>
         <Grid item xs={12}>
           <Button
             variant="rainbow"
-            value={t('common.continue')}
+            value={t("common.continue")}
             onClick={() => handleChangeStep(1)}
             loading={loading}
             disabled={!disabled}
@@ -71,7 +96,7 @@ const Step1 = ({handleChangeStep}) => {
         </Grid>
       </Grid>
     </Container>
-  )
-}
+  );
+};
 
-export default Step1
+export default Step1;
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index ac35df06..1d1a2a01 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -11,15 +11,19 @@ const useSteps = () => {
   const { navigator } = useRouter();
   const { t } = useTranslation();
 
+  const [userPemFile, setUserPemFile] = useState(null);
+
   const handleChangeStep = (index) => setStep(index);
   const handleClose = () => navigator.navigate('home');
 
   const leftButton = (onClick) => <LinkButton value={t('common.back')} onClick={onClick} startIcon={BackIcon} />;
   const rightButton = <LinkButton value={t('common.close')} onClick={handleClose} />;
 
+
+
   const steps = [
     {
-      component: <Step1 handleChangeStep={handleChangeStep} />,
+      component: <Step1 handleChangeStep={handleChangeStep} setUserPemFile={setUserPemFile} userPemFile={userPemFile} />,
       left: leftButton(() => handleClose()),
       right: rightButton,
       center: `${t("importPem.importPEMfile")}`,
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 226247b3..a6e80662 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -62,6 +62,7 @@ export default makeStyles((theme) => ({
     alignItems: 'center',
     marginTop: 12,
     gap: 4,
+    zIndex: 100,
   },
   dragDropIcon: {
     color: '#BBBEC2',

From 7a579bebac5d29e6a725055c2f08f21b9cd58a6c Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 3 Oct 2022 18:21:14 -0300
Subject: [PATCH 075/132] can move to step2 added disabled state for continue
 button

---
 source/views/Extension/Views/ImportWallet/Steps/Step1.jsx | 4 ++++
 source/views/Extension/Views/ImportWallet/styles.js       | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 405a9732..2b41ac26 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -18,11 +18,15 @@ const Step1 = ({ handleChangeStep, setUserPemFile, userPemFile }) => {
   const [disabled, setDisabled] = useState(false);
 
   const handleRemoveFile = () => {
+    setDisabled(false);
     setUserPemFile(null);
   };
 
   const onDrop = useCallback((acceptedFile) => {
+    setLoading(true);
     setUserPemFile(acceptedFile[0]);
+    setDisabled(true);
+    setLoading(false);
   }, []);
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index a6e80662..b1d5b18d 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -1,5 +1,4 @@
 import { makeStyles } from '@material-ui/core/styles';
-import zIndex from '@material-ui/core/styles/zIndex';
 
 export default makeStyles((theme) => ({
   dragDropContainer: {

From c68f855c0f9c8c9c49330e8716e1d601baf2a58e Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 3 Oct 2022 19:54:32 -0500
Subject: [PATCH 076/132] Fixed connect account modal (#618)

---
 source/Modules/storageManager.js              |  4 ++--
 .../components/ConnectAccountItem/index.jsx   |  9 ++++++--
 .../components/ConnectAccountsModal/index.jsx | 23 ++++++++++++++-----
 .../ConnectAccountsModal/layout.jsx           |  4 ++--
 source/components/Profile/index.jsx           |  2 +-
 source/views/Extension/Views/Home/index.jsx   |  4 ++--
 .../Extension/Views/WalletDetails/index.jsx   |  2 +-
 7 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/source/Modules/storageManager.js b/source/Modules/storageManager.js
index 1f5a5cf1..f35fb69b 100644
--- a/source/Modules/storageManager.js
+++ b/source/Modules/storageManager.js
@@ -159,12 +159,12 @@ export const getWalletsConnectedToUrl = (url, walletIds, cb) => {
     return;
   }
 
-  walletIds.forEach((id) => {
+  walletIds.forEach((id, index) => {
     getApp(id.toString(), url, (app = {}) => {
       if (app?.status === CONNECTION_STATUS.accepted) {
         wallets.push(id);
       }
-      if (id === walletIds.length - 1) {
+      if (index === walletIds.length - 1) {
         cb(wallets);
       }
     });
diff --git a/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx b/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx
index 0095716e..b7da819c 100644
--- a/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx
+++ b/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx
@@ -13,9 +13,14 @@ const ConnectAccountItem = ({
   connected, wallet, checked, onCheck, name,
 }) => {
   const classes = useStyles();
+
+  const handleCheckboxChange = (event) => {
+    !connected && onCheck(event, wallet.walletId);
+  };
+
   return (
     <div
-      key={wallet.walletNumber}
+      key={wallet.walletId}
       className={clsx(
         classes.flex,
         classes.walletContainer,
@@ -26,7 +31,7 @@ const ConnectAccountItem = ({
         <Checkbox
           className={classes.checkbox}
           checked={checked}
-          handleChange={!connected && onCheck(wallet.walletNumber)}
+          handleChange={handleCheckboxChange}
         />
         <UserIcon size="small" icon={wallet.icon} style={{ marginLeft: -6, marginRight: 12 }} />
         <Typography variant="h6" className={classes.walletName}>{name || ''}</Typography>
diff --git a/source/components/ConnectAccountsModal/index.jsx b/source/components/ConnectAccountsModal/index.jsx
index 19ac88e6..ce7f8530 100644
--- a/source/components/ConnectAccountsModal/index.jsx
+++ b/source/components/ConnectAccountsModal/index.jsx
@@ -36,8 +36,8 @@ const ConnectAccountsModal = ({
     getReverseResolvedNames();
   }, [wallets]);
 
-  const connectAccountToTab = (wallet) => {
-    getApps(wallet.walletNumber.toString(), (apps) => {
+  const connectAccountToTab = (walletId) => {
+    getApps(walletId.toString(), (apps) => {
       // If any other account is connected, create an entry for the current wallet
       const date = new Date().toISOString();
       const url = getTabURL(tab);
@@ -55,19 +55,30 @@ const ConnectAccountsModal = ({
           ],
         },
       };
-      setApps(wallet.walletNumber.toString(), newApps);
+      setApps(walletId.toString(), newApps);
     });
   };
 
+  const updateProviderConnection = async () => {
+    const currentWallet = wallets?.[walletId] || null;
+    if (currentWallet) {
+      extension.tabs.query({ active: true }, (activeTabs) => {
+        extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
+      });
+    }
+  };
+
   const handleConfirm = () => {
-    Object.keys(walletsToUpdate).forEach((walletId) => connectAccountToTab(wallets[walletId], tab));
+    Object.keys(walletsToUpdate).forEach((walletId) => {
+      walletsToUpdate[walletId] && connectAccountToTab(walletId, tab)
+    });
     onConfirm?.();
     setWalletsToUpdate({});
     setSelectAllWallets(false);
     onClose();
   };
 
-  const onCheckWallet = (walletId) => (event) => {
+  const onCheckWallet = (event, walletId) => {
     setWalletsToUpdate({
       ...walletsToUpdate,
       [walletId]: event.target.checked,
@@ -77,7 +88,7 @@ const ConnectAccountsModal = ({
   const handleSelectAll = (event) => {
     const newWalletsToUpdate = {};
     wallets.forEach((wallet) => {
-      newWalletsToUpdate[wallet.walletNumber] = event.target.checked;
+      newWalletsToUpdate[wallet.walletId] = event.target.checked;
     });
     setSelectAllWallets(event.target.checked);
     setWalletsToUpdate(newWalletsToUpdate);
diff --git a/source/components/ConnectAccountsModal/layout.jsx b/source/components/ConnectAccountsModal/layout.jsx
index 6090f288..3542d7cb 100644
--- a/source/components/ConnectAccountsModal/layout.jsx
+++ b/source/components/ConnectAccountsModal/layout.jsx
@@ -46,14 +46,14 @@ const ConnectAccountsModalLayout = ({
         onScroll={onScroll}
       >
         {wallets.map((wallet) => {
-          const alreadyConnected = connectedWallets.includes(wallet.walletNumber);
+          const alreadyConnected = connectedWallets.includes(wallet.walletId);
           return (
             <ConnectAccountItem
               name={icnsNames[wallet?.principal] || wallet?.name}
               wallet={wallet}
               connected={alreadyConnected}
               checked={
-                  !!walletsToUpdate[wallet.walletNumber]
+                  !!walletsToUpdate[wallet.walletId]
                   || alreadyConnected
                 }
               onCheck={onCheckWallet}
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index 39d99d8e..f1d330f6 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -149,7 +149,7 @@ const Profile = ({ disableProfile }) => {
     setSelectedWallet(wallet);
     extensionizer.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => {
       const url = getTabURL(tabs?.[0]);
-      const ids = accounts.map((_, idx) => idx);
+      const ids = accounts.map((account) => account.walletId);
       setTab(tabs?.[0]);
       // Check if new wallet is connected to the current page
       getWalletsConnectedToUrl(url, ids, async (wallets = []) => {
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 7e47441f..9d2d4773 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -80,7 +80,7 @@ const Home = () => {
     extension.tabs.query({ active: true, lastFocusedWindow: true }, (browserTabs) => {
       const currentTab = browserTabs?.[0];
       const url = getTabURL(currentTab);
-      const ids = state.wallets.map((_, idx) => idx);
+      const ids = Object.values(state.wallets).map((account) => account.walletId);
       setTab(currentTab);
       getWalletsConnectedToUrl(url, ids, (_connectedWallets = []) => {
         setConnectedWallets(_connectedWallets);
@@ -115,7 +115,7 @@ const Home = () => {
         isClockInSync().then((isInSync) => !isInSync && navigator.navigate('clockError'));
         validateProviderConnection(state);
       } else if (!migratedWalletId) {
-        state.wallets.forEach((wallet) => {
+        Object.values(state.wallets).forEach((wallet) => {
           updateWalletId(wallet.walletNumber, wallet.walletId);
         }); 
       }
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index c24b7548..65d33816 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -217,7 +217,7 @@ const WalletDetails = () => {
   const handleChangeAccount = () => {
     extensionizer.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => {
       const url = getTabURL(tabs?.[0]);
-      const ids = accounts.map((_, idx) => idx);
+      const ids = accounts.map((account) => account.walletId);
       setTab(tabs?.[0]);
       // Check if new wallet is connected to the current page
       setAccountSwitchId(walletId);

From 43bb49e14091bf0bcfce6bb334c88efd577daa9a Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 3 Oct 2022 20:00:31 -0500
Subject: [PATCH 077/132] Fix/Contacts (#616)

* WIP

* Code cleanup

* mend

* Fixed hiddenAccounts

* Fixed state accounts

* Fixed export identity

* Bumped controller version

* Added missing semicolon

* Plug controller bump
---
 package.json                                  |  2 +-
 .../components/ConnectionControls/index.jsx   |  5 +-
 source/components/IDInput/index.jsx           |  6 +--
 .../Profile/components/AccountItem/index.jsx  |  8 ++--
 source/components/Profile/index.jsx           |  6 +--
 source/hooks/index.js                         |  1 -
 source/hooks/useContacts.jsx                  | 22 ---------
 source/redux/contacts.js                      | 46 ++++++++-----------
 .../views/Extension/Views/Contacts/index.jsx  |  7 +--
 .../Views/ExportIdentity/steps/Step2.jsx      |  6 +--
 source/views/Extension/Views/Login/index.jsx  |  5 +-
 .../views/Extension/Views/SendFlow/index.jsx  |  9 ++--
 .../Extension/Views/WalletDetails/index.jsx   |  5 +-
 yarn.lock                                     |  8 ++--
 14 files changed, 52 insertions(+), 84 deletions(-)
 delete mode 100644 source/hooks/useContacts.jsx

diff --git a/package.json b/package.json
index f0bdfc10..b212de1b 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.22.2",
+    "@psychedelic/plug-controller": "0.23.0",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index 88b0eb93..786633f3 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -6,7 +6,6 @@ import extensionizer from 'extensionizer';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 
-import { useContacts } from '@hooks';
 import { useICPPrice } from '@redux/icp';
 import {
   setAssets,
@@ -18,6 +17,7 @@ import {
 } from '@redux/wallet';
 import { getApps } from '@modules/storageManager';
 import { getCurrentNetwork, getNetworks } from '@redux/network';
+import { getContacts } from '@redux/contacts';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { TABS, useRouter } from '@components/Router';
 import RefreshAsset from '@assets/icons/refresh.svg';
@@ -29,7 +29,6 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   const classes = useStyles();
   const icpPrice = useICPPrice();
   const dispatch = useDispatch();
-  const { getContacts } = useContacts();
   const { tabIndex } = disableNavigation ? {} : useRouter();
   const {
     principalId,
@@ -118,7 +117,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
 
     if (icpPrice) {
       // Contacts
-      getContacts(true);
+      dispatch(getContacts({ refresh: true }));
 
       loadAssets();
       loadCollections();
diff --git a/source/components/IDInput/index.jsx b/source/components/IDInput/index.jsx
index f33d7246..18d2642b 100644
--- a/source/components/IDInput/index.jsx
+++ b/source/components/IDInput/index.jsx
@@ -8,9 +8,8 @@ import { useTranslation } from 'react-i18next';
 
 import { CircularProgress, Grid } from '@material-ui/core';
 import { getRandomEmoji } from '@shared/constants/emojis';
-import { addContact as addContactAction } from '@redux/contacts';
+import { getContacts, addContact as addContactAction } from '@redux/contacts';
 
-import { useContacts } from '@hooks';
 import ActionDialog from '../ActionDialog';
 import ContactItem from '../ContactItem';
 import ContactList from '../ContactList';
@@ -26,7 +25,6 @@ const IDInput = ({
 }) => {
   const classes = useStyles();
   const { t } = useTranslation();
-  const { getContacts } = useContacts();
 
   const dispatch = useDispatch();
   const [selectedContact, setSelectedContact] = useState(null);
@@ -39,7 +37,7 @@ const IDInput = ({
   const { contactsLoading } = useSelector((state) => state.contacts);
 
   useEffect(() => {
-    getContacts();
+   dispatch(getContacts());
   }, []);
 
   const isUserAddress = useMemo(
diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 6d5dacb2..c2f00b8d 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -22,12 +22,12 @@ const AccountItem = ({
   const hiddenAccounts = useHiddenAccounts();
   const dispatch = useDispatch();
 
-  const isHidden = hiddenAccounts.includes(account.walletNumber);
+  const isHidden = hiddenAccounts.includes(account.walletId);
 
-  const toggleAccountVisibility = (account) => (e) => {
+  const toggleAccountVisibility = (e, walletId) => {
     e.preventDefault();
     e.stopPropagation();
-    dispatch(toggleAccountHidden(account));
+    dispatch(toggleAccountHidden(walletId));
   };
 
   if (isHidden && !isEditing) return null;
@@ -64,7 +64,7 @@ const AccountItem = ({
         </IconButton>
         { isEditing && (
           <IconButton
-            onClick={toggleAccountVisibility(account.walletNumber)}
+            onClick={(e) => { toggleAccountVisibility(e, account.walletId) }}
           >
             <img src={isHidden ? InvisibleIcon : VisibleIcon} />
           </IconButton>
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index f1d330f6..d1f39505 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -25,7 +25,8 @@ import { getWalletsConnectedToUrl, getApp } from '@modules/storageManager';
 import { setEditAccount, toggleAccountHidden, useHiddenAccounts } from '@redux/profile';
 import { setICNSData } from '@redux/icns';
 import { useICPPrice } from '@redux/icp';
-import { useMenuItems, useContacts } from '@hooks';
+import { getContacts } from '@redux/contacts';
+import { useMenuItems } from '@hooks';
 import ConnectAccountsModal from '../ConnectAccountsModal';
 import HoverAnimation from '../HoverAnimation';
 import MenuItem from '../MenuItem';
@@ -59,7 +60,6 @@ const Profile = ({ disableProfile }) => {
   const [accountName, setAccountName] = useState('');
   const [error, setError] = useState(null);
   const [connectedWallets, setConnectedWallets] = useState([]);
-  const { getContacts } = useContacts();
 
   const handleToggle = () => {
     setOpen((prevOpen) => !prevOpen);
@@ -119,7 +119,7 @@ const Profile = ({ disableProfile }) => {
         if (walletsArray.length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
-          getContacts();
+          dispatch(getContacts());
           dispatch(setICNSData(newWallet.icnsData));
           dispatch(setAssetsLoading(true));
           dispatch(setTransactions([]));
diff --git a/source/hooks/index.js b/source/hooks/index.js
index 800dfe1e..5c4c3f16 100644
--- a/source/hooks/index.js
+++ b/source/hooks/index.js
@@ -7,4 +7,3 @@ export { default as useActivity } from './useActivity';
 export { default as useDebounce } from './useDebounce';
 export { default as useICNS } from './useICNS';
 export { default as useScroll } from './useScroll';
-export { default as useContacts } from './useContacts';
diff --git a/source/hooks/useContacts.jsx b/source/hooks/useContacts.jsx
deleted file mode 100644
index 40b973e6..00000000
--- a/source/hooks/useContacts.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useDispatch } from 'react-redux';
-import { getContacts as getReduxContacts } from '@redux/contacts';
-import { getDabContacts } from '@modules/storageManager';
-
-const useContacts = () => {
-  const dispatch = useDispatch();
-
-  const getContacts = (refresh = false) => {
-    getDabContacts((contactList) => {
-      dispatch(getReduxContacts({
-        localContacts: contactList,
-        refresh,
-      }));
-    });
-  };
-
-  return {
-    getContacts,
-  };
-};
-
-export default useContacts;
diff --git a/source/redux/contacts.js b/source/redux/contacts.js
index 818837d8..27118136 100644
--- a/source/redux/contacts.js
+++ b/source/redux/contacts.js
@@ -1,9 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { buildContactObject, parseContactFromDab } from '@shared/utils/contacts';
-import {
-  setDabContacts as setLocalDabContacts,
-} from '@modules/storageManager';
 import {
   getContacts as callGetContacts,
   addContact as callAddContact,
@@ -88,6 +85,7 @@ export const contactSlice = createSlice({
     contacts: [],
     groupedContacts: [],
     contactsLoading: false,
+    pendingDelete: false,
   },
   reducers: { },
   extraReducers: (builder) => {
@@ -96,8 +94,6 @@ export const contactSlice = createSlice({
         const contact = action.meta.arg;
         const newContactList = [...state.contacts, contact];
 
-        setLocalDabContacts(newContactList);
-
         state.contacts = newContactList;
         state.groupedContacts = groupContacts(newContactList);
       })
@@ -105,51 +101,47 @@ export const contactSlice = createSlice({
         const contact = action.meta.arg;
         const filteredContacts = state.contacts.filter((c) => c.id === contact.id);
 
-        setLocalDabContacts(filteredContacts);
-
         state.contacts = filteredContacts;
         state.groupedContacts = groupContacts(filteredContacts);
       })
       .addCase(getContacts.pending, (state, action) => {
-        state.contactsLoading = true;
-        if (action.meta.arg.refresh) {
+        if (action.meta.arg?.refresh) {
           state.contacts = [];
           state.groupedContacts = [];
-          setLocalDabContacts([]);
-        } else {
-          state.contacts = action.meta.arg.localContacts;
-          state.groupedContacts = groupContacts(action.meta.arg.localContacts);
         }
+        state.contactsLoading = true;
       })
       .addCase(getContacts.fulfilled, (state, action) => {
-        let newContactList = [
-          ...state?.contacts,
-          ...action?.payload,
-          ...action.meta.arg?.localContacts,
-        ];
-        newContactList = filterContactsById(newContactList);
-        setLocalDabContacts(newContactList);
-
-        state.contacts = newContactList;
-        state.groupedContacts = groupContacts(newContactList);
+        // Doesn't update contact list if removeContact is pending
+        if (!state.pendingDelete) {
+          let newContactList = [
+            ...state?.contacts,
+            ...action?.payload,
+          ];
+          newContactList = filterContactsById(newContactList);
+
+          state.contacts = newContactList;
+          state.groupedContacts = groupContacts(newContactList);
+        }
         state.contactsLoading = false;
       })
       .addCase(removeContact.pending, (state, action) => {
         const contact = action.meta.arg;
         const filteredContacts = state.contacts.filter((c) => c.name !== contact.name);
 
-        setLocalDabContacts(filteredContacts);
-
+        state.pendingDelete = true;
         state.contacts = filteredContacts;
         state.groupedContacts = groupContacts(filteredContacts);
       })
+      .addCase(removeContact.fulfilled, (state, action) => {
+        state.pendingDelete = false;
+      })
       .addCase(removeContact.rejected, (state, action) => {
         const contact = action.meta.arg;
 
         const newContactList = [...state.contacts, contact];
 
-        setLocalDabContacts(newContactList);
-
+        state.pendingDelete = false;
         state.contacts = newContactList;
         state.groupedContacts = groupContacts(newContactList);
       });
diff --git a/source/views/Extension/Views/Contacts/index.jsx b/source/views/Extension/Views/Contacts/index.jsx
index 0d0bfc87..4c86326e 100644
--- a/source/views/Extension/Views/Contacts/index.jsx
+++ b/source/views/Extension/Views/Contacts/index.jsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux'
 import { Layout, Header } from '@components';
-import { useContacts } from '@hooks';
+import { getContacts } from '@redux/contacts';
 import useSteps from './hooks/useSteps';
 
 const Contacts = () => {
@@ -10,9 +11,9 @@ const Contacts = () => {
     right,
     center,
   } = useSteps();
-  const { getContacts } = useContacts();
+  const dispatch = useDispatch();
 
-  useEffect(getContacts, []);
+  useEffect(() => { dispatch(getContacts()); }, []);
 
   return (
     <Layout>
diff --git a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
index 8b8cd856..9e20d382 100644
--- a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
+++ b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
@@ -21,7 +21,7 @@ const Step2 = () => {
 
   const handleCloseAccounts = (value) => {
     setOpenAccounts(false);
-    setSelectedAccountId(value.walletNumber);
+    setSelectedAccountId(value.walletId);
   };
 
   const handleDownloadPemFile = () => {
@@ -36,7 +36,7 @@ const Step2 = () => {
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.values(state?.wallets).length) {
           setAccounts(state.wallets);
           setSelectedAccountId(state.currentWalletId);
         }
@@ -66,7 +66,7 @@ const Step2 = () => {
           />
           <Dialog
             title={t('exportIdentity.selectAccount')}
-            items={accounts.map((a) => ({
+            items={Object.values(accounts).map((a) => ({
               ...a,
               icon: <UserIcon size="small" icon={a.icon} style={{ marginLeft: -6, marginRight: 12 }} />,
               endText: shortAddress(a.principal),
diff --git a/source/views/Extension/Views/Login/index.jsx b/source/views/Extension/Views/Login/index.jsx
index 33ca75f1..101be966 100644
--- a/source/views/Extension/Views/Login/index.jsx
+++ b/source/views/Extension/Views/Login/index.jsx
@@ -10,9 +10,9 @@ import {
 import { useRouter } from '@components/Router';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { setAccountInfo } from '@redux/wallet';
+import { getContacts } from '@redux/contacts';
 import { isClockInSync } from '@shared/utils/time';
 import { syncContactsToDab } from '@shared/utils/contacts';
-import { useContacts } from '@hooks';
 
 import PropTypes from 'prop-types';
 import useStyles from './styles';
@@ -22,7 +22,6 @@ const Login = ({ redirect }) => {
   const dispatch = useDispatch();
   const { t } = useTranslation();
   const { navigator } = redirect ? {} : useRouter();
-  const { getContacts } = useContacts();
 
   const [password, setPassword] = useState('');
   const [error, setError] = useState(false);
@@ -39,7 +38,7 @@ const Login = ({ redirect }) => {
     }, (unlocked) => {
       if (unlocked) {
         // Upload contacts
-        syncContactsToDab().then(getContacts());
+        syncContactsToDab().then(dispatch(getContacts()));
 
         isClockInSync()
           .then((isInRange) => {
diff --git a/source/views/Extension/Views/SendFlow/index.jsx b/source/views/Extension/Views/SendFlow/index.jsx
index 8a3664a1..fa40222b 100644
--- a/source/views/Extension/Views/SendFlow/index.jsx
+++ b/source/views/Extension/Views/SendFlow/index.jsx
@@ -1,18 +1,21 @@
 import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { getContacts } from '@redux/contacts';
 import { Layout, Header } from '@components';
-import { useContacts } from '@hooks';
 import useSteps from './hooks/useSteps';
 
 const Send = () => {
-  const { getContacts } = useContacts();
   const {
     component,
     left,
     right,
     center,
   } = useSteps();
+  const dispatch = useDispatch();
 
-  useEffect(getContacts, []);
+  useEffect(() => {
+    dispatch(getContacts());
+  }, []);
 
   return (
     <Layout>
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 65d33816..d38d1725 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -21,8 +21,8 @@ import {
   updateWalletDetails,
 } from '@redux/wallet';
 import { useICPPrice } from '@redux/icp';
+import { getContacts } from '@redux/contacts';
 import { setICNSData, setUseICNS as setReduxUseICNS } from '@redux/icns';
-import { useContacts } from '@hooks';
 
 import BlueCheck from '@assets/icons/blue-check.svg';
 import Pencil from '@assets/icons/pencil.svg';
@@ -52,7 +52,6 @@ const WalletDetails = () => {
     names: reduxNames,
   } = useSelector((state) => state.icns);
   const dispatch = useDispatch();
-  const { getContacts } = useContacts();
   const icpPrice = useICPPrice();
 
   const { editAccount } = useSelector((state) => state.profile);
@@ -253,7 +252,7 @@ const WalletDetails = () => {
         if (Object.values(state?.wallets).length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
-          getContacts();
+          dipatch(getContacts());
           dispatch(setICNSData(newWallet.icnsData));
           dispatch(setAssetsLoading(true));
           dispatch(setTransactions([]));
diff --git a/yarn.lock b/yarn.lock
index 9783c6d0..3c99f541 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.22.2":
-  version "0.22.2"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.2/3649bd743783f92da34172b0e51cdc12144f829f#3649bd743783f92da34172b0e51cdc12144f829f"
-  integrity sha512-csZn2lYklXMBiUBBqDE9GO885rwvXf2vZe9jz3biGzVgoeJaLks2/fbcRCN0zopsAtxVeyFCUMWwS7yvHKERKw==
+"@psychedelic/plug-controller@0.23.0":
+  version "0.23.0"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.23.0/2c22d15300a8485643b31bb0eb1b62e2fd39d093#2c22d15300a8485643b31bb0eb1b62e2fd39d093"
+  integrity sha512-UUIOEayAQhZoxjXQbvKvkHJSeXiosVhr2nxGyG748P4gdAgLsR4qYdGaM487O9mZlpSNNctZJDocUhAIMZRklQ==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From a7bea8efd5f233c769caaa44bd22d67ab9d61ec2 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Mon, 3 Oct 2022 19:21:54 -0600
Subject: [PATCH 078/132] Installed controller 0.23.0 with state trim

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

diff --git a/package.json b/package.json
index e3dccc13..e35df593 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.11",
-    "@psychedelic/plug-controller": "../plug-controller",
+    "@psychedelic/plug-controller": "0.23.0",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index f9a1834d..37bd6447 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1773,10 +1773,10 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js@1.4.10":
-  version "1.4.10"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.10/ab2728aa672012b6889bbfc2730e63149517e965#ab2728aa672012b6889bbfc2730e63149517e965"
-  integrity sha512-OBVif7y1qAk4ZPeB7bEeQGbDgUuNpwndGU86N8dNsoAmrgrHpNb47DGHnH9Rs6KG7fPMBnNed15BUBzCRVKR2Q==
+"@psychedelic/dab-js@1.4.11":
+  version "1.4.11"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.11/e6800b2304edc64299407ec32f5749b1f30ec60b#e6800b2304edc64299407ec32f5749b1f30ec60b"
+  integrity sha512-lWNRBSbJCjDKOG+xNwcL809TUguoJM8jGhPlxhIBwoy5u2RZrMcMQ7DmlpKkUsXqi5VGEiP25Ud23pPPjejc+w==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/dab-js@1.4.11":
-  version "1.4.11"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.11/e6800b2304edc64299407ec32f5749b1f30ec60b#e6800b2304edc64299407ec32f5749b1f30ec60b"
-  integrity sha512-lWNRBSbJCjDKOG+xNwcL809TUguoJM8jGhPlxhIBwoy5u2RZrMcMQ7DmlpKkUsXqi5VGEiP25Ud23pPPjejc+w==
+"@psychedelic/dab-js@1.4.12":
+  version "1.4.12"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.12/ee252e693f8606327f479cbbdbfe8424b422e8f5#ee252e693f8606327f479cbbdbfe8424b422e8f5"
+  integrity sha512-oJwMbgafesO5KOBoV70oQ929wel18n0X6u/IBtR7mcBa0SdwM2uyhbgjNqVLpFdBaVBRoAxKdCABc4sVRcqglg==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1801,19 +1801,17 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@../plug-controller":
-<<<<<<< HEAD
+"@psychedelic/plug-controller@0.23.0":
   version "0.23.0"
-=======
-  version "0.21.1"
->>>>>>> 6c1b884af215c458baafe75b929c38e456e1a3a7
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.23.0/2c22d15300a8485643b31bb0eb1b62e2fd39d093#2c22d15300a8485643b31bb0eb1b62e2fd39d093"
+  integrity sha512-UUIOEayAQhZoxjXQbvKvkHJSeXiosVhr2nxGyG748P4gdAgLsR4qYdGaM487O9mZlpSNNctZJDocUhAIMZRklQ==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.10"
+    "@psychedelic/dab-js" "1.4.12"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"

From 61b4aff63d75bd4ae2d20c6aa858d52a78bbed16 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Tue, 4 Oct 2022 02:31:56 -0300
Subject: [PATCH 079/132] now pass the params to the controller

---
 package.json                                  |   2 +-
 source/Background/Keyring/index.js            |   5 +-
 .../Views/ImportWallet/Steps/Step1.jsx        |   1 -
 .../Views/ImportWallet/Steps/Step2.jsx        |  46 ++++--
 .../ImportWallet/components/DragDropBox.jsx   | 141 ------------------
 .../Views/ImportWallet/hooks/useSteps.jsx     |   1 +
 yarn.lock                                     |  16 +-
 7 files changed, 50 insertions(+), 162 deletions(-)
 delete mode 100644 source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx

diff --git a/package.json b/package.json
index b31775be..0f94305a 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.21.0",
+    "@psychedelic/plug-controller": "/Users/cancu/Dev/plug-controller",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 5237d077..21f96e5e 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -90,6 +90,7 @@ export const HANDLER_TYPES = {
   GET_NFT_INFO: 'get-nft-info',
   ADD_CUSTOM_TOKEN: 'add-custom-token',
   ADD_CUSTOM_NFT: 'add-custom-nft',
+  IMPORT_PEM_ACCOUNT: 'import-pem-account',
   CREATE_PRINCIPAL: 'create-principal',
   SET_CURRENT_PRINCIPAL: 'set-current-principal',
   GET_PEM_FILE: 'get-pem-file',
@@ -126,6 +127,7 @@ export const getKeyringErrorMessage = (type) => ({
   [HANDLER_TYPES.GET_NFT_INFO]: 'fetching nft info.',
   [HANDLER_TYPES.ADD_CUSTOM_TOKEN]: 'adding custom token.',
   [HANDLER_TYPES.ADD_CUSTOM_NFT]: 'adding custom nft.',
+  [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: 'importing account from pem',
   [HANDLER_TYPES.CREATE_PRINCIPAL]: 'creating your principal.',
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]: 'setting your principal.',
   [HANDLER_TYPES.GET_PEM_FILE]: 'getting your PEM file.',
@@ -182,6 +184,7 @@ export const getKeyringHandler = (type, keyring) => ({
       return null;
     }
   },
+  [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: async (params) => keyring.importAccountFromPem(params),
   [HANDLER_TYPES.CREATE_PRINCIPAL]: async (params) => keyring.createPrincipal(params),
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]:
     async (walletId) => {
@@ -478,7 +481,7 @@ export const getKeyringHandler = (type, keyring) => ({
       console.log('Error removing the network', e);
       return { error: e.message };
     }
-  }
+  },
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index 2b41ac26..d0a46fcb 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -1,6 +1,5 @@
 import { Container, Button } from "@components";
 import React, { useState, useCallback, useEffect } from "react";
-import DragDropBox from "../components/DragDropBox";
 import { useTranslation } from "react-i18next";
 import { useDropzone } from "react-dropzone";
 import useStyles from "../styles";
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 8385d81b..3f8863c6 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -3,11 +3,12 @@ import Grid from '@material-ui/core/Grid';
 import useStyles from '../styles';
 import React, { useState } from 'react';
 import { useRouter } from '@components/Router';
+import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import Picker from 'emoji-picker-react';
 import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
-const Step2 = () => {
+const Step2 = ({ userPemFile }) => {
   const { t } = useTranslation();
 
   const [loading, setLoading] = useState(false);
@@ -21,6 +22,14 @@ const Step2 = () => {
   
 
   const classes = useStyles();
+  
+    useEffect(() => {
+      if (walletName && walletName !== "") {
+        setDisabled(true);
+      } else {
+        setDisabled(false);
+      }
+    }, [currentEmoji, walletName]);
 
   const onEmojiClick = (_event, emojiObject) => {
     setCurrentEmoji(emojiObject.emoji);
@@ -28,14 +37,33 @@ const Step2 = () => {
     setOpenEmojiSelector(false);
   };
 
-  useEffect(() => {
-    if (walletName && walletName !== "") {
-      setDisabled(true);
-    } else {
-      setDisabled(false);
-    }
-  }, [currentEmoji, walletName]);
+  const createImportedAccount = (pemContent) => {
+    console.log(pemContent)
+    sendMessage({
+      type: HANDLER_TYPES.IMPORT_PEM_ACCOUNT,
+      params: {icon: currentEmoji, name: walletName, pem: pemContent},
+    },
+    (newWallet) => {
+      if (newWallet) {
+        setAccounts([...accounts, newWallet]);
+      }
+      setAccountName('');
+      setOpenCreateAccount(false);
+    });
+    setLoading(false);
+    navigator.navigate('home');
+  }
 
+  const readPemCreateAccount = () => {
+    setLoading(true);
+    setDisabled(true);
+    let fileReader = new FileReader();
+    fileReader.readAsText(userPemFile);
+    fileReader.onloadend = () => {
+      const content = fileReader.result; // we should check what happens if the user pass an empty pem file
+      createImportedAccount(content);
+    };
+  }
 
   return (
     <Container>
@@ -87,7 +115,7 @@ const Step2 = () => {
           <Button
             variant="rainbow"
             value={t('common.save')}
-            onClick={() => navigator.navigate('home')}
+            onClick={() => readPemCreateAccount()}
             loading={loading}
             disabled={!disabled}
             fullWidth
diff --git a/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx b/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
deleted file mode 100644
index da80095c..00000000
--- a/source/views/Extension/Views/ImportWallet/components/DragDropBox.jsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import React, { useState } from 'react'
-import { useTranslation } from 'react-i18next';
-import useStyles from '../styles';
-import { CloudUpload } from '@material-ui/icons';
-import CloseIcon from '@material-ui/icons/Close';
-import { useEffect } from 'react';
-import GradientFile from '@assets/icons/gradient-file.svg';
-import { Typography } from '@material-ui/core';
-import RedWarningIcon from '@assets/icons/red-warning-icon.svg';
-import { Plug } from "@components";
-
-const DragDropBox = ({ acceptedExtension, setLoading, setDisabled }) => {
-  const { t } = useTranslation();
-  const classes = useStyles();
-
-  const [dragActive, setDragActive] = useState(false);
-  const [fileNotSupported, setFileNotSupported] = useState(false);
-  const [file, setFile] = useState(null);
-
-  const handleRemoveFile = () => {
-    setFile(null);
-    setDisabled(false);
-  }
-
-  useEffect(() => {
-    if (fileNotSupported) {
-      setTimeout(() => {
-        console.log('arranca setTimeOut');
-        setFileNotSupported(false);
-      }, 2000)
-    }
-  }, [fileNotSupported]);
-
-  // could be a good feature for the future accept more than one extension
-  const checkDesiredFile = (fileObject) => {
-    setLoading(true);
-    setLoading(false);
-    const fileExt = fileObject[0]?.name.split('.').pop();
-    if (fileExt === acceptedExtension) {
-      console.log('extension correcta', fileExt);
-      console.log('file extension', fileObject[0]);
-      setFile(fileObject[0]);
-      setLoading(false);
-      setDisabled(true);
-    } else {
-      setFileNotSupported(true);
-      console.log('extension incorrecta', fileExt);
-    }
-  }
-
-  const handleDrag = (e) => {
-    console.log('entra en el handle Drag');
-    e.preventDefault();
-    e.stopPropagation();
-    if (e.type === "dragenter" || e.type === "dragover") {
-      setDragActive(true);
-    } else if (e.type === "dragleave") {
-      setDragActive(false);
-    }
-  }
-
-  const handleDrop = (e) => {
-    console.log('entra en el handle Drop');
-    e.preventDefault();
-    e.stopPropagation();
-    setDragActive(false);
-    if (e.dataTransfer.files && e.dataTransfer.files[0]) {
-      checkDesiredFile(e.dataTransfer.files);
-    }
-  };
-
-  const handleChange = (e) => {
-    console.log('entra en el handleChange');
-    e.preventDefault();
-    e.stopPropagation();
-    if (e.target.files && e.target.files[0]) {
-      checkDesiredFile(e.target.files);
-    }
-  }
-
-
-  return (
-    <>
-      <div className={fileNotSupported ? classes.dragDropContainerError : classes.dragDropContainer}>
-        <form
-          onDragEnter={handleDrag}
-          onDragLeave={handleDrag}
-          onDragOver={handleDrag}
-          onDrop={handleDrop}
-          onSubmit={(e) => e.preventDefault()}
-          className={classes.insideDragDrop}
-        >
-          <input type="file" id='input-file-upload' className={classes.inputFile} multiple={true} onChange={handleChange} />
-          {
-            file ? (
-              <>
-                <img src={GradientFile} alt="gradientFile" />
-                <div className={classes.nameXIcon}>
-                  <Typography variant='h5'>
-                    {file.name || ''}
-                  </Typography>
-                  <CloseIcon className={classes.icon} onClick={() => handleRemoveFile()} />
-                </div>
-              </>
-            ) : (
-              <>
-                {
-                  dragActive ? (
-                    <div className={classes.dropItContainer}>
-                      <Plug size="small" /> 
-                      <span className={classes.dropItLabel}>
-                        {t('importPem.dropIt')}
-                      </span>
-                    </div>
-                  ) : (
-                    <>
-                      <CloudUpload style={{ color: '#BBBEC2' }} fontSize='large' />
-                      <Typography className={classes.dragDropText} variant='h6'>
-                        {t('importPem.dragAndDrop')}<br />
-                        {t('importPem.or')} <label className={classes.inputFileLabel} id="label-file-upload" htmlFor="input-file-upload">{t('importPem.browse')}</label>
-                      </Typography>
-                    </>
-                  )
-                }
-              </>
-            )
-          }
-        </form>
-        {
-          fileNotSupported && (
-            <span className={classes.error}>
-              <img src={RedWarningIcon} alt="" /> {t('importPem.fileNotSupported')}
-            </span>
-          )
-        }
-      </div>
-    </>
-  )
-}
-
-export default DragDropBox
\ No newline at end of file
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index 1d1a2a01..0d204d9b 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -31,6 +31,7 @@ const useSteps = () => {
     {
       component: <Step2
         handleClose={handleClose}
+        userPemFile={userPemFile}
       />,
       right: rightButton,
       center: `${t("importPem.walletDetails")}`,
diff --git a/yarn.lock b/yarn.lock
index 3e7bb7ca..ecef19ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1773,10 +1773,10 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js@1.4.10":
-  version "1.4.10"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.10/ab2728aa672012b6889bbfc2730e63149517e965#ab2728aa672012b6889bbfc2730e63149517e965"
-  integrity sha512-OBVif7y1qAk4ZPeB7bEeQGbDgUuNpwndGU86N8dNsoAmrgrHpNb47DGHnH9Rs6KG7fPMBnNed15BUBzCRVKR2Q==
+"@psychedelic/dab-js@1.4.12":
+  version "1.4.12"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.12/ee252e693f8606327f479cbbdbfe8424b422e8f5#ee252e693f8606327f479cbbdbfe8424b422e8f5"
+  integrity sha512-oJwMbgafesO5KOBoV70oQ929wel18n0X6u/IBtR7mcBa0SdwM2uyhbgjNqVLpFdBaVBRoAxKdCABc4sVRcqglg==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1801,17 +1801,15 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.21.0":
-  version "0.21.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.0/48e547f647bcbd1723cd4536688bf07811b15ee7#48e547f647bcbd1723cd4536688bf07811b15ee7"
-  integrity sha512-L/Jkrl7tjIosZth1IKj5d0m+pTbsB+y1LgFRpI1LJsXEoWbgzEjwsesgeN5BvNNbqW+SMPTPcUusk+Fug6WaFA==
+"@psychedelic/plug-controller@file:../plug-controller":
+  version "0.23.1"
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.10"
+    "@psychedelic/dab-js" "1.4.12"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"

From af7d7fbd46c3a0155c93788349e14e737c84ab68 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 4 Oct 2022 21:12:38 -0600
Subject: [PATCH 080/132] Migrated methods to redux

---
 package.json                                  |  2 +-
 source/Background/Keyring/index.js            | 19 +++-
 .../components/ConnectionControls/index.jsx   | 22 +----
 source/components/NFTs/index.jsx              | 21 ++---
 source/components/Profile/index.jsx           |  4 +-
 source/redux/nfts.js                          | 59 +++++++++++-
 source/redux/wallet.js                        | 20 -----
 .../Extension/Views/AddNFT/Steps/Step2.jsx    | 26 +-----
 .../SendNFT/components/NFTDisplay/index.jsx   |  2 +-
 .../SendNFT/components/ReviewStep/index.jsx   | 90 +++++++++++--------
 .../Extension/Views/WalletDetails/index.jsx   |  2 +-
 yarn.lock                                     | 31 +++++++
 12 files changed, 174 insertions(+), 124 deletions(-)

diff --git a/package.json b/package.json
index d3afa27c..40c84496 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.23.0",
+    "@psychedelic/plug-controller": "../plug-controller",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index f8594253..bc846dd4 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -157,6 +157,15 @@ export const sendMessage = (args, callback) => {
   });
 };
 
+export const asyncSendMessage = (args, callback) => new Promise((resolve) => {
+  sendMessage(args, (response) => {
+    if (callback) {
+      callback(response);
+    }
+    resolve(response);
+  });
+});
+
 export const getKeyringHandler = (type, keyring) => ({
   [HANDLER_TYPES.LOCK]: async () => keyring.lock(),
   [HANDLER_TYPES.UNLOCK]: async (params) => {
@@ -291,9 +300,10 @@ export const getKeyringHandler = (type, keyring) => ({
   [HANDLER_TYPES.ADD_CUSTOM_NFT]:
     async ({ canisterId, standard }) => {
       try {
-        const nfts = await keyring.registerNFT({
+        await keyring.registerNFT({
           canisterId, standard,
         });
+        const nfts = await keyring.getNFTs({ refresh: true });
         return (nfts || []).map((nft) => recursiveParseBigint(nft));
       } catch (e) {
         // eslint-disable-next-line
@@ -328,14 +338,15 @@ export const getKeyringHandler = (type, keyring) => ({
         return { error: e.message };
       }
     },
-  [HANDLER_TYPES.GET_NFTS]: async ({ refresh = false }) => {
+  [HANDLER_TYPES.GET_NFTS]: async ({ refresh } = { refresh: false }) => {
     const collections = await keyring.getNFTs({ refresh });
     return (collections || [])?.map((collection) => recursiveParseBigint(collection));
   },
   [HANDLER_TYPES.TRANSFER_NFT]: async ({ to, nft }) => {
     try {
-      const response = await keyring.transferNFT({ to, token: nft });
-      return recursiveParseBigint(response);
+      await keyring.transferNFT({ to, token: nft });
+      const nfts = await keyring.getNFTs({ refresh: true });
+      return recursiveParseBigint(nfts);
     } catch (e) {
       // eslint-disable-next-line
       console.log('Error transfering NFT', e);
diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index 786633f3..8faa38c4 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -12,12 +12,11 @@ import {
   setAssetsLoading,
   setTransactions,
   setTransactionsLoading,
-  setCollections,
-  setCollectionsLoading,
 } from '@redux/wallet';
 import { getApps } from '@modules/storageManager';
 import { getCurrentNetwork, getNetworks } from '@redux/network';
 import { getContacts } from '@redux/contacts';
+import { getNFTs } from '@redux/nfts';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { TABS, useRouter } from '@components/Router';
 import RefreshAsset from '@assets/icons/refresh.svg';
@@ -31,12 +30,11 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   const dispatch = useDispatch();
   const { tabIndex } = disableNavigation ? {} : useRouter();
   const {
-    principalId,
     walletId,
     assetsLoading,
     transactionsLoading,
-    collectionsLoading,
   } = useSelector((state) => state.wallet);
+  const { collectionsLoading } = useSelector((state) => state.nfts);
   const { useICNS } = useSelector((state) => state.icns);
   const { currentNetwork } = useSelector((state) => state.network);
   const [selectorOpen, setSelectorOpen] = useState(false);
@@ -95,21 +93,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   };
 
   const loadCollections = () => {
-    dispatch(setCollectionsLoading(true));
-    sendMessage(
-      {
-        type: HANDLER_TYPES.GET_NFTS,
-        params: { refresh: true },
-      },
-      (nftCollections) => {
-        if (nftCollections?.length) {
-          dispatch(
-            setCollections({ collections: nftCollections, principalId }),
-          );
-        }
-        dispatch(setCollectionsLoading(false));
-      },
-    );
+    dispatch(getNFTs());
   };
 
   const refreshWallet = () => {
diff --git a/source/components/NFTs/index.jsx b/source/components/NFTs/index.jsx
index 5e1aabdc..8f5255e5 100644
--- a/source/components/NFTs/index.jsx
+++ b/source/components/NFTs/index.jsx
@@ -1,9 +1,9 @@
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
+import { getNFTs } from '@redux/nfts';
+
 import LoadingWrapper from '../LoadingWrapper';
-import { setCollections, setCollectionsLoading } from '../../redux/wallet';
 import useStyles from './styles';
 import EmptyState from './components/EmptyState';
 import NFTCollection from './components/NFTCollection';
@@ -12,23 +12,12 @@ const NFTs = () => {
   const classes = useStyles();
   const dispatch = useDispatch();
 
-  const {
-    collections, collectionsLoading, principalId, optimisticNFTUpdate,
-  } = useSelector((state) => state.wallet);
+  const { principalId } = useSelector((state) => state.wallet);
+  const { collections, collectionsLoading } = useSelector((state) => state.nfts);
 
   useEffect(() => {
-    // Update cache
     if (!collectionsLoading) {
-      dispatch(setCollectionsLoading(true));
-      sendMessage({
-        type: HANDLER_TYPES.GET_NFTS,
-        params: {},
-      }, (nftCollections) => {
-        if (nftCollections?.length && !optimisticNFTUpdate) {
-          dispatch(setCollections({ collections: nftCollections, principalId }));
-        }
-        dispatch(setCollectionsLoading(false));
-      });
+      dispatch(getNFTs());
     }
   }, [principalId]);
 
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index d1f39505..1920f866 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -22,7 +22,7 @@ import {
 import { getRandomEmoji } from '@shared/constants/emojis';
 import { getTabURL } from '@shared/utils/chrome-tabs';
 import { getWalletsConnectedToUrl, getApp } from '@modules/storageManager';
-import { setEditAccount, toggleAccountHidden, useHiddenAccounts } from '@redux/profile';
+import { setEditAccount } from '@redux/profile';
 import { setICNSData } from '@redux/icns';
 import { useICPPrice } from '@redux/icp';
 import { getContacts } from '@redux/contacts';
@@ -112,9 +112,9 @@ const Profile = ({ disableProfile }) => {
   };
 
   const executeAccountSwitch = (wallet) => {
-    dispatch(setCollections({ collections: [], principalId }));
     sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: wallet },
       (state) => {
+        console.log('state on account switch from profile', state);
         const walletsArray = Object.values(state?.wallets);
         if (walletsArray.length) {
           const newWallet = state.wallets[state.currentWalletId];
diff --git a/source/redux/nfts.js b/source/redux/nfts.js
index 49953766..d0b036c6 100644
--- a/source/redux/nfts.js
+++ b/source/redux/nfts.js
@@ -1,4 +1,43 @@
-import { createSlice } from '@reduxjs/toolkit';
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import { asyncSendMessage, HANDLER_TYPES } from '@background/Keyring';
+
+export const getNFTs = createAsyncThunk(
+  'nfts/getNFTs',
+  async () => asyncSendMessage({
+    type: HANDLER_TYPES.GET_NFTS,
+  }),
+);
+
+export const transferNFT = createAsyncThunk(
+  'nfts/transferNFT',
+  async (params) => asyncSendMessage({
+    type: HANDLER_TYPES.TRANSFER_NFT,
+    params,
+  }),
+);
+
+export const registerNFT = createAsyncThunk(
+  'nfts/registerNFT',
+  async (params) => asyncSendMessage({
+    type: HANDLER_TYPES.ADD_CUSTOM_NFT,
+    params,
+  }),
+);
+
+const sortCollections = (collections = []) => {
+  const icns = collections.find((col) => col.name === 'ICNS');
+  const sorted = collections
+    .filter((col) => col.name !== 'ICNS')
+    .sort((a, b) => b?.name - a?.name);
+  return [icns, ...sorted].filter((col) => !!col);
+};
+
+const setCollectionsLoading = (state) => { state.collectionsLoading = true; };
+const updateCollections = (state, action) => {
+  state.collections = sortCollections(action.payload);
+  state.collectionsLoading = false;
+};
+const setError = (state, action) => { state.error = action.payload; };
 
 /* eslint-disable no-param-reassign */
 export const nftSlice = createSlice({
@@ -7,6 +46,9 @@ export const nftSlice = createSlice({
     selectedNft: null,
     sendAddress: null,
     resolvedSendAddress: null,
+    collections: [],
+    collectionsLoading: false,
+    error: null,
   },
   reducers: {
     setSelectedNft: (state, action) => {
@@ -18,6 +60,21 @@ export const nftSlice = createSlice({
       state.resolvedSendAddress = resolvedAddress;
     },
   },
+  extraReducers: (builder) => {
+    builder
+      .addCase(getNFTs.pending, setCollectionsLoading)
+      .addCase(getNFTs.rejected, setError)
+      .addCase(getNFTs.fulfilled, updateCollections)
+      .addCase(transferNFT.pending, setCollectionsLoading)
+      .addCase(transferNFT.fulfilled, (state, action) => {
+        updateCollections(state, action);
+        state.selectedNft = null;
+      })
+      .addCase(transferNFT.rejected, setError)
+      .addCase(registerNFT.pending, setCollectionsLoading)
+      .addCase(registerNFT.fulfilled, updateCollections)
+      .addCase(registerNFT.rejected, setError);
+  },
 });
 
 export const { setSelectedNft, setSendAddress } = nftSlice.actions;
diff --git a/source/redux/wallet.js b/source/redux/wallet.js
index 8b9818f4..d4d3f0ce 100644
--- a/source/redux/wallet.js
+++ b/source/redux/wallet.js
@@ -8,14 +8,6 @@ import {
   TOKEN_IMAGES,
 } from '@shared/constants/currencies';
 
-const sortCollections = (collections = []) => {
-  const icns = collections.find((col) => col.name === 'ICNS');
-  const sorted = collections
-    .filter((col) => col.name !== 'ICNS')
-    .sort((a, b) => b?.name - a?.name);
-  return [icns, ...sorted].filter((col) => !!col);
-};
-
 /* eslint-disable no-param-reassign */
 export const walletSlice = createSlice({
   name: 'wallet',
@@ -28,8 +20,6 @@ export const walletSlice = createSlice({
     assets: Object.values(TOKENS),
     walletId: '',
     assetsLoading: true,
-    collections: [],
-    collectionsLoading: false,
     transactionsLoading: false,
   },
   reducers: {
@@ -107,16 +97,6 @@ export const walletSlice = createSlice({
     setAssetsLoading: (state, action) => {
       state.assetsLoading = action.payload;
     },
-    setCollections: (state, action) => {
-      const { collections, principalId } = action.payload;
-      if (state.principalId === principalId && collections) {
-        state.collections = sortCollections(collections);
-      }
-      state.optimisticNFTUpdate = false;
-    },
-    setCollectionsLoading: (state, action) => {
-      state.collectionsLoading = action.payload;
-    },
     blockNFTFetch: (state) => {
       state.optimisticNFTUpdate = true;
     },
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
index cd0604f2..b4fd8d06 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -22,30 +22,12 @@ const Step2 = ({ selectedToken, handleClose }) => {
   const { t } = useTranslation();
   const classes = useStyles();
   const dispatch = useDispatch();
-  const [loading, setLoading] = useState(false);
 
-  const { principalId } = useSelector((state) => state.wallet);
+  const { collectionsLoading } = useSelector((state) => state.nfts);
 
   const registerToken = () => {
-    setLoading(true);
-    sendMessage({
-      type: HANDLER_TYPES.ADD_CUSTOM_NFT,
-      params: selectedToken,
-    }, async () => {
-      sendMessage({
-        type: HANDLER_TYPES.GET_NFTS,
-        params: { refresh: true },
-      },
-        (nftCollections) => {
-          if (nftCollections?.length) {
-            dispatch(setCollections({ collections: nftCollections, principalId }));
-          }
-          dispatch(setCollectionsLoading(false));
-          setLoading(false);
-          handleClose();
-        }
-      );
-    });
+    dispatch(registerNFT(selectedToken));
+    handleClose();
   };
 
   return (
@@ -70,7 +52,7 @@ const Step2 = ({ selectedToken, handleClose }) => {
             variant="rainbow"
             value={t('common.add')}
             onClick={registerToken}
-            loading={loading}
+            loading={collectionsLoading}
             disabled={loading}
             fullWidth
             data-testid="add-button"
diff --git a/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx b/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx
index 5cf0f25c..b5703d8d 100644
--- a/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx
@@ -10,7 +10,7 @@ const NFTDisplay = ({ nft }) => {
   const classes = useStyles();
 
   const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[nft?.canisterId];
-
+  console.log('nft to display', nft);
   return (
     <Card className={classes.nftDisplayContainer}>
       <NFTDisplayer url={nft?.url} className={classes.nftImage} defaultTag={nftDefaultTag} />
diff --git a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
index 7aa2e63d..589a5436 100644
--- a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
@@ -1,16 +1,14 @@
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
 
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { TABS } from '@components/Router';
+import { TABS, useRouter } from '@components/Router';
 import {
   Button, Alert,
   AddressTranslation,
 } from '@components';
-import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import { blockNFTFetch, setCollections } from '@redux/wallet';
-import { setSelectedNft } from '@redux/nfts';
+import { transferNFT } from '@redux/nfts';
 import { ADDRESS_TYPES } from '@shared/constants/addresses';
 
 import NFTDisplay from '../NFTDisplay';
@@ -21,59 +19,77 @@ const ReviewStep = () => {
   const { t } = useTranslation();
   const classes = useStyles();
   const dispatch = useDispatch();
-  const [loading, setLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
-  const { collections, principalId } = useSelector((state) => state.wallet);
-  const { selectedNft: nft, sendAddress, resolvedSendAddress } = useSelector((state) => state.nfts);
+  const { navigator } = useRouter();
 
-  const collection = useMemo(() => collections?.find(
-    (col) => col.name === nft?.collection,
-  ) || {},
-  [collections, nft]);
+  const {
+    selectedNft: nft,
+    sendAddress,
+    resolvedSendAddress,
+    collections,
+    collectionsLoading,
+    error,
+  } = useSelector((state) => state.nfts);
 
-  const transferNFT = () => {
-    setLoading(true);
-    setErrorMessage('');
+  const executeTransferNFT = () => {
     const to = resolvedSendAddress?.address || sendAddress?.address;
-    sendMessage({ type: HANDLER_TYPES.TRANSFER_NFT, params: { nft, to } },
-      (response) => {
-        setLoading(false);
-        if (response.error) {
-          setErrorMessage(response.error);
-        } else {
-          dispatch(setCollections({
-            collections: response,
-            principalId,
-          }));
-          dispatch(blockNFTFetch());
-          dispatch(setSelectedNft(null));
-          navigator.navigate('home', TABS.NFTS);
-        }
-      });
+    dispatch(transferNFT({ nft, to }));
+    // setLoading(true);
+    // setErrorMessage('');
+    // sendMessage({ type: HANDLER_TYPES.TRANSFER_NFT, params: { nft, to } },
+    //   (response) => {
+    //     setLoading(false);
+    //     if (response.error) {
+    //       setErrorMessage(response.error);
+    //     } else {
+    //       dispatch(setCollections({
+    //         collections: response,
+    //         principalId,
+    //       }));
+    //       dispatch(blockNFTFetch());
+    //     }
+    //   });
   };
+
+  useEffect(() => {
+    if (error) {
+      setErrorMessage(error);
+    }
+  }, [error]);
+
+  useEffect(() => {
+    if (!nft) {
+      navigator.navigate('home', TABS.NFTS);
+    }
+  }, [nft]);
+
   const addresses = sendAddress?.type === ADDRESS_TYPES.ICNS
     ? [sendAddress, resolvedSendAddress]
     : [sendAddress];
 
+  const collection = useMemo(() => collections?.find(
+      (col) => col.canisterId === nft?.canister,
+    ) || {},
+  [collections, nft]);
+
+  console.log('collection', collections, collection);
   return (
     <div className={classes.reviewStepContainer}>
-      <NFTDisplay nft={nft} />
-      <AddressTranslation addresses={addresses} loading={loading} />
+      <NFTDisplay nft={{ ...nft, collection: collection?.name }} />
+      <AddressTranslation addresses={addresses} loading={collectionsLoading} />
       <Button
         variant="rainbow"
         value={t('common.confirm')}
         fullWidth
-        onClick={transferNFT}
-        loading={loading}
+        onClick={executeTransferNFT}
+        loading={collectionsLoading}
         data-testid="confirmation-button"
       />
       {errorMessage?.length > 0 && (
         <div className={classes.errorBox}>
           <Alert
             type="danger"
-            title={(
-              <span>{errorMessage}</span>
-                )}
+            title={(<span>{errorMessage}</span>)}
           />
         </div>
       )}
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index d38d1725..6754a12c 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -246,9 +246,9 @@ const WalletDetails = () => {
   };
 
   const executeAccountSwitch = (wallet) => {
-    dispatch(setCollections({ collections: [], principalId }));
     sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: accountSwitchId },
       (state) => {
+        console.log('state on account switch from details', state);
         if (Object.values(state?.wallets).length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
diff --git a/yarn.lock b/yarn.lock
index 21900d7b..34f5c1d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,6 +1787,37 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
+"@psychedelic/plug-controller@../plug-controller":
+  version "0.23.1"
+  dependencies:
+    "@dfinity/agent" "0.9.3"
+    "@dfinity/candid" "0.9.3"
+    "@dfinity/identity" "0.9.3"
+    "@dfinity/principal" "0.9.3"
+    "@psychedelic/cap-js" "0.0.7"
+    "@psychedelic/dab-js" "1.4.12"
+    "@types/secp256k1" "^4.0.3"
+    axios "^0.21.1"
+    babel-jest "^25.5.1"
+    bigint-conversion "^2.2.1"
+    bip39 "^3.0.4"
+    buffer-crc32 "^0.2.13"
+    create-hmac "^1.1.7"
+    cross-fetch "^3.1.4"
+    crypto-js "^4.0.0"
+    ed25519-hd-key "^1.2.0"
+    extensionizer "^1.0.1"
+    hdkey "^2.0.1"
+    js-sha256 "^0.9.0"
+    json-bigint "^1.0.0"
+    random-color "^1.0.1"
+    reflect-metadata "^0.1.13"
+    secp256k1 "^4.0.2"
+    text-encoding "^0.7.0"
+    text-encoding-shim "^1.0.5"
+    tweetnacl "^1.0.3"
+    uuidv4 "^6.2.13"
+
 "@psychedelic/plug-controller@0.23.0":
   version "0.23.0"
   resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.23.0/2c22d15300a8485643b31bb0eb1b62e2fd39d093#2c22d15300a8485643b31bb0eb1b62e2fd39d093"

From 087d614a8567c85833d5f23b385353dbf63a49d4 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 4 Oct 2022 21:34:40 -0600
Subject: [PATCH 081/132] Rollback controller to 0.22.3

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

diff --git a/package.json b/package.json
index b212de1b..9e1287a2 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.23.0",
+    "@psychedelic/plug-controller": "0.22.3",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 3c99f541..759e242e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.23.0":
-  version "0.23.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.23.0/2c22d15300a8485643b31bb0eb1b62e2fd39d093#2c22d15300a8485643b31bb0eb1b62e2fd39d093"
-  integrity sha512-UUIOEayAQhZoxjXQbvKvkHJSeXiosVhr2nxGyG748P4gdAgLsR4qYdGaM487O9mZlpSNNctZJDocUhAIMZRklQ==
+"@psychedelic/plug-controller@0.22.3":
+  version "0.22.3"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.3/0de97b56824db0aab742fbe5a69fe44eb0edee8c#0de97b56824db0aab742fbe5a69fe44eb0edee8c"
+  integrity sha512-1mP7hEnzKBll/3r70vCh8v/v+Yby/G6rx5TFBIbVB4Wkx+H23wQi+pF0LeQk8oBL/Z+3PApfXjiCQ/YSxlZBAQ==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 59c10dec7b2b2591d7c59f90455f5e34570ed9ee Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 4 Oct 2022 22:55:43 -0600
Subject: [PATCH 082/132] Fixed collection info and nft details issues

---
 .../Extension/Views/NFTDetails/index.jsx      | 39 ++++++++++++-------
 .../SendNFT/components/InputStep/index.jsx    |  4 +-
 .../SendNFT/components/ReviewStep/index.jsx   |  8 ++--
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/source/views/Extension/Views/NFTDetails/index.jsx b/source/views/Extension/Views/NFTDetails/index.jsx
index 414388a5..67809625 100644
--- a/source/views/Extension/Views/NFTDetails/index.jsx
+++ b/source/views/Extension/Views/NFTDetails/index.jsx
@@ -1,8 +1,10 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import {
   Layout,
   Header, Button, Badge, LinkButton, NFTDisplayer, ICNSDisplay,
 } from '@components';
+import { HttpAgent } from '@dfinity/agent';
+import { getNFTActor } from '@psychedelic/dab-js';
 import { useTranslation } from 'react-i18next';
 import BackIcon from '@assets/icons/back.svg';
 import ExpandIcon from '@assets/icons/expand.svg';
@@ -21,11 +23,19 @@ import { NFT_COLLECTION_DEFAULT_TYPES } from '@shared/constants/nft';
 import Section from './components/section';
 import useStyles from './styles';
 
+const getTokenDetails = async ({ index, canister, standard }) => {
+  const agent = new HttpAgent({ host: 'https://ic0.app/' });
+  const NFTActor = getNFTActor({ canisterId: canister, standard, agent });
+  const details = await NFTActor.details(index);
+  return details;
+}
+
 const NFTDetails = () => {
   const { t } = useTranslation();
   const { selectedNft: nft } = useSelector((state) => state.nfts);
   const { collections } = useSelector((state) => state.wallet);
   const { navigator: routerNavigator } = useRouter();
+  const [populatedNFT, setPopulatedNFT] = useState(nft);
   const classes = useStyles();
   const dispatch = useDispatch();
   if (!nft) {
@@ -38,15 +48,15 @@ const NFTDetails = () => {
     routerNavigator.navigate('home', TABS.NFTS);
   };
 
-  const collection = useMemo(() => collections?.find((col) => col.name === nft?.collection),
+  const collection = useMemo(() => collections?.find((col) => col.canisterId === nft?.canister),
     [collections, nft]);
 
   const name = `${nft?.name ?? `#${nft?.index}`}`;
-  const isICNS = nft?.collection === 'ICNS';
+  const isICNS = collection?.name === 'ICNS';
 
   const openNFT = (url) => {
     const parsedUrl = isICNS
-      ? `https://icns.id/domains/${nft?.name.replace('.icp', '')}/detail`
+      ? `https://icns.id/domains/${populatedNFT?.name.replace('.icp', '')}/detail`
       : url;
 
     extension.tabs.create({
@@ -59,10 +69,11 @@ const NFTDetails = () => {
   // eslint-disable-next-line no-confusing-arrow
   const handleButtonClick = (url) => isICNS ? openNFT(url) : copyNFT(url);
 
-  const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[nft.canisterId];
+  const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[populatedNFT.canisterId];
 
   useEffect(() => {
     window.scrollTo(0, 0);
+    getTokenDetails(nft).then((details) => setPopulatedNFT({ ...nft, ...details }));
   }, []);
 
   return (
@@ -75,16 +86,16 @@ const NFTDetails = () => {
             className={classes.expandIcon}
             src={ExpandIcon}
             data-testid="expand-nft"
-            onClick={() => openNFT(nft?.url?.replace('type=thumbnail', ''))}
+            onClick={() => openNFT(populatedNFT?.url?.replace('type=thumbnail', ''))}
             data-testid="expand-nft"
           />
         )}
       />
       <div className={classes.container}>
         {isICNS ? (
-          <ICNSDisplay icns={nft} className={classes.image} large />
+          <ICNSDisplay icns={populatedNFT} className={classes.image} large />
         ) : (
-          <NFTDisplayer url={nft?.url} className={classes.image} defaultTag={nftDefaultTag} interactive />
+          <NFTDisplayer url={populatedNFT?.url} className={classes.image} defaultTag={nftDefaultTag} interactive />
         )}
         <div className={classes.buttonContainer}>
           <Button
@@ -92,7 +103,7 @@ const NFTDetails = () => {
             value={t(`nfts.${isICNS ? 'manage' : 'copyLink'}`)}
             style={{ width: '96%' }}
             fullWidth
-            onClick={() => handleButtonClick(nft?.url?.replace('type=thumbnail', ''))}
+            onClick={() => handleButtonClick(populatedNFT?.url?.replace('type=thumbnail', ''))}
             buttonTestId="copy-link-button"
             endIcon={isICNS && (
               <ArrowUpRight
@@ -112,18 +123,18 @@ const NFTDetails = () => {
           />
         </div>
         <Section icon={CollectionImg} title={t('nfts.collection')}>
-          <Badge value={nft?.collection} icon={collection?.icon} iconClassName={classes.icnsIcon} />
+          <Badge value={collection?.name} icon={collection?.icon} iconClassName={classes.icnsIcon} />
           <Badge value={name} />
         </Section>
-        {!!nft?.desc && (
+        {!!populatedNFT?.desc && (
           <Section icon={DescriptionImg} title={t('nfts.description')}>
-            <Typography variant="subtitle1">{nft?.desc}</Typography>
+            <Typography variant="subtitle1">{populatedNFT?.desc}</Typography>
           </Section>
         )}
-        {nft?.metadata?.properties?.filter((prop) => typeof prop?.value !== 'object')?.length >= 1 && (
+        {populatedNFT?.metadata?.properties?.filter((prop) => typeof prop?.value !== 'object')?.length >= 1 && (
           <Section icon={AttributesImg} title={t('nfts.attributes')}>
             {
-              nft?.metadata?.properties?.map((prop) => ((
+              populatedNFT?.metadata?.properties?.map((prop) => ((
                 <Badge
                   name={prop.name}
                   value={prop?.value}
diff --git a/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx b/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx
index 64c1fd2c..d272ad43 100644
--- a/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx
@@ -32,7 +32,7 @@ const InputStep = ({ advanceStep }) => {
     || [principalId, accountId].includes(resolvedAddress);
 
   const collection = useMemo(() => collections?.find(
-    (col) => col.name === nft?.collection,
+    (col) => col.canisterId === nft?.canister,
   ) || {},
   [collections, nft]);
 
@@ -64,7 +64,7 @@ const InputStep = ({ advanceStep }) => {
                 name={nft?.name || `${collection?.name ?? ''} #${nft?.index}`}
                 text={`#${nft?.index}`}
                 imageClassName={classes.nftImage}
-                nft={nft}
+                nft={{ ...nft, collection: collection?.name }}
                 readonly
                 shadow
               />
diff --git a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
index 7aa2e63d..79bf46f1 100644
--- a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
@@ -10,7 +10,7 @@ import {
 } from '@components';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { blockNFTFetch, setCollections } from '@redux/wallet';
-import { setSelectedNft } from '@redux/nfts';
+import nfts, { setSelectedNft } from '@redux/nfts';
 import { ADDRESS_TYPES } from '@shared/constants/addresses';
 
 import NFTDisplay from '../NFTDisplay';
@@ -27,8 +27,8 @@ const ReviewStep = () => {
   const { selectedNft: nft, sendAddress, resolvedSendAddress } = useSelector((state) => state.nfts);
 
   const collection = useMemo(() => collections?.find(
-    (col) => col.name === nft?.collection,
-  ) || {},
+      (col) => col.canisterId === nft?.canister,
+    ) || {},
   [collections, nft]);
 
   const transferNFT = () => {
@@ -57,7 +57,7 @@ const ReviewStep = () => {
 
   return (
     <div className={classes.reviewStepContainer}>
-      <NFTDisplay nft={nft} />
+      <NFTDisplay nft={{ ...nft, collection: collection?.name }} />
       <AddressTranslation addresses={addresses} loading={loading} />
       <Button
         variant="rainbow"

From 6607f60e94901d441d16dba1177ed00d2fb072af Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 5 Oct 2022 08:55:03 -0500
Subject: [PATCH 083/132] Fixed popup & connect accounts info (#625)

---
 source/components/ConnectAccountsModal/index.jsx   |  9 ++++++---
 source/views/Extension/Views/Home/index.jsx        | 14 +++++++++++++-
 source/views/Extension/Views/Login/index.jsx       |  2 +-
 .../views/Extension/Views/WalletDetails/index.jsx  |  2 +-
 source/views/Popup/components/AllowAgent/index.jsx |  2 +-
 .../views/Popup/components/AppConnection/index.jsx |  2 +-
 source/views/Popup/components/BurnXTC/index.jsx    |  2 +-
 .../views/Popup/components/ImportToken/index.jsx   |  2 +-
 .../Sign/components/BatchTransactions/index.jsx    |  2 +-
 source/views/Popup/components/Sign/index.jsx       |  2 +-
 source/views/Popup/components/Transfer/index.jsx   |  2 +-
 source/views/Popup/index.jsx                       |  2 +-
 12 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/source/components/ConnectAccountsModal/index.jsx b/source/components/ConnectAccountsModal/index.jsx
index ce7f8530..c2bdba91 100644
--- a/source/components/ConnectAccountsModal/index.jsx
+++ b/source/components/ConnectAccountsModal/index.jsx
@@ -59,8 +59,8 @@ const ConnectAccountsModal = ({
     });
   };
 
-  const updateProviderConnection = async () => {
-    const currentWallet = wallets?.[walletId] || null;
+  const updateProviderConnection = async (walletId) => {
+    const currentWallet = wallets.find(w => w.walletId === walletId) || null;
     if (currentWallet) {
       extension.tabs.query({ active: true }, (activeTabs) => {
         extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
@@ -70,7 +70,10 @@ const ConnectAccountsModal = ({
 
   const handleConfirm = () => {
     Object.keys(walletsToUpdate).forEach((walletId) => {
-      walletsToUpdate[walletId] && connectAccountToTab(walletId, tab)
+      if (walletsToUpdate[walletId]) {
+        connectAccountToTab(walletId, tab)
+        updateProviderConnection(walletId);
+      }
     });
     onConfirm?.();
     setWalletsToUpdate({});
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 9d2d4773..17aad961 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -98,7 +98,8 @@ const Home = () => {
   };
 
   const updateProviderConnection = async () => {
-    const currentWallet = wallets?.[walletId] || null;
+    const currentWallet = wallets.find(w => w.walletId === walletId) || null;
+
     if (currentWallet) {
       extension.tabs.query({ active: true }, (activeTabs) => {
         extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
@@ -130,8 +131,19 @@ const Home = () => {
     getUseICNS(walletId, (useICNS) => {
       dispatch(setUseICNS(useICNS));
     });
+    updateProviderConnection();
   }, [walletId]);
 
+  useEffect(() => {
+    sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
+      (state) => {
+        const walletsArray = Object.values(state?.wallets);
+        if (walletsArray?.length) {
+          setWallets(walletsArray);
+        }
+      });
+  }, []);
+
   return (
     <Layout>
       <Actions visible={tabIndex === 0} />
diff --git a/source/views/Extension/Views/Login/index.jsx b/source/views/Extension/Views/Login/index.jsx
index 101be966..76446248 100644
--- a/source/views/Extension/Views/Login/index.jsx
+++ b/source/views/Extension/Views/Login/index.jsx
@@ -50,7 +50,7 @@ const Login = ({ redirect }) => {
           type: HANDLER_TYPES.GET_STATE,
           params: { },
         }, (state) => {
-          if (state?.wallets?.length) {
+          if (Object.keys(state?.wallets).length) {
             dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
           }
         });
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index d38d1725..cc66d54f 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -275,7 +275,7 @@ const WalletDetails = () => {
 
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets)?.length) {
         setAccounts(state.wallets);
       }
     });
diff --git a/source/views/Popup/components/AllowAgent/index.jsx b/source/views/Popup/components/AllowAgent/index.jsx
index bb24b0ba..d4578efd 100644
--- a/source/views/Popup/components/AllowAgent/index.jsx
+++ b/source/views/Popup/components/AllowAgent/index.jsx
@@ -81,7 +81,7 @@ const AllowAgent = ({
       });
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/components/AppConnection/index.jsx b/source/views/Popup/components/AppConnection/index.jsx
index 36ed8610..0842dfff 100644
--- a/source/views/Popup/components/AppConnection/index.jsx
+++ b/source/views/Popup/components/AppConnection/index.jsx
@@ -100,7 +100,7 @@ const AppConnection = ({ setOnTimeout, transactionId, metadata }) => {
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.keys(state?.wallets).length) {
           dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
         }
       });
diff --git a/source/views/Popup/components/BurnXTC/index.jsx b/source/views/Popup/components/BurnXTC/index.jsx
index b40f9489..5a3ed8a7 100644
--- a/source/views/Popup/components/BurnXTC/index.jsx
+++ b/source/views/Popup/components/BurnXTC/index.jsx
@@ -48,7 +48,7 @@ const BurnXTC = ({
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.keys(state?.wallets).length) {
           dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
         }
       });
diff --git a/source/views/Popup/components/ImportToken/index.jsx b/source/views/Popup/components/ImportToken/index.jsx
index bb4ec136..6b63259b 100644
--- a/source/views/Popup/components/ImportToken/index.jsx
+++ b/source/views/Popup/components/ImportToken/index.jsx
@@ -63,7 +63,7 @@ const ImportToken = ({
       handleImportToken(CONNECTION_STATUS.refused);
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx b/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
index e457fa89..f58798ab 100644
--- a/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
+++ b/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
@@ -55,7 +55,7 @@ const BatchTransactions = ({
 
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/components/Sign/index.jsx b/source/views/Popup/components/Sign/index.jsx
index bb2b2b9a..e5d1995b 100644
--- a/source/views/Popup/components/Sign/index.jsx
+++ b/source/views/Popup/components/Sign/index.jsx
@@ -87,7 +87,7 @@ const AssetsWarning = ({
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.keys(state?.wallets).length) {
           dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
         }
       });
diff --git a/source/views/Popup/components/Transfer/index.jsx b/source/views/Popup/components/Transfer/index.jsx
index bb826ccc..68dfb220 100644
--- a/source/views/Popup/components/Transfer/index.jsx
+++ b/source/views/Popup/components/Transfer/index.jsx
@@ -45,7 +45,7 @@ const Transfer = ({
       handleDeclineAll();
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/index.jsx b/source/views/Popup/index.jsx
index e759d1af..43538e7e 100644
--- a/source/views/Popup/index.jsx
+++ b/source/views/Popup/index.jsx
@@ -53,7 +53,7 @@ const NotificationContainer = () => {
   useEffect(() => {
     try {
       sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-        if (state?.wallets?.length) {
+        if (Object.values(state?.wallets).length) {
           sendMessage({ type: HANDLER_TYPES.GET_LOCKS, params: {} }, (locks) => {
             if (locks?.isUnlocked) {
               setLoggedIn(true);

From 30be9c710c794425da919becf7f0415a11084d47 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 5 Oct 2022 11:33:05 -0300
Subject: [PATCH 084/132] it works perfect! check emoji selector size

---
 source/components/Profile/index.jsx                      | 2 +-
 .../views/Extension/Views/ImportWallet/Steps/Step2.jsx   | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index 85a75064..79b44175 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -77,7 +77,7 @@ const Profile = ({ disableProfile }) => {
           setAccounts(walletsArray);
         }
       });
-  }, []);
+  }, [open]);
 
   const handleChangeAccountName = (e) => {
     const name = e.target.value;
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 3f8863c6..850b243a 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -42,13 +42,8 @@ const Step2 = ({ userPemFile }) => {
     sendMessage({
       type: HANDLER_TYPES.IMPORT_PEM_ACCOUNT,
       params: {icon: currentEmoji, name: walletName, pem: pemContent},
-    },
-    (newWallet) => {
-      if (newWallet) {
-        setAccounts([...accounts, newWallet]);
-      }
-      setAccountName('');
-      setOpenCreateAccount(false);
+    }, (wallet) => {
+      console.log(wallet);
     });
     setLoading(false);
     navigator.navigate('home');

From 9674a57b930210ed132ead8f00424da0fa9408fe Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Wed, 5 Oct 2022 12:00:58 -0600
Subject: [PATCH 085/132] Abstracted internalRequestBalance and fixed issues
 with bigint parsing

---
 source/Background/Keyring/index.js       |  5 +--
 source/Background/errors.js              |  1 +
 source/Modules/Controller/information.js | 40 +++++++++---------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 5237d077..2522959a 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -233,7 +233,8 @@ export const getKeyringHandler = (type, keyring) => ({
       const assets = await keyring.getBalances({ subaccount: walletId });
       const parsedAssets = parseAssetsAmount(assets);
       const icpPrice = await getICPPrice();
-      return formatAssets(parsedAssets, icpPrice);
+      const formattedAssets = formatAssets(parsedAssets, icpPrice);
+      return formattedAssets.map((asset) => recursiveParseBigint(asset));
     } catch (error) {
       // eslint-disable-next-line
       console.log('Error when fetching token balances', error);
@@ -478,7 +479,7 @@ export const getKeyringHandler = (type, keyring) => ({
       console.log('Error removing the network', e);
       return { error: e.message };
     }
-  }
+  },
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {
diff --git a/source/Background/errors.js b/source/Background/errors.js
index 3f39ee0e..3977a721 100644
--- a/source/Background/errors.js
+++ b/source/Background/errors.js
@@ -27,5 +27,6 @@ export default {
     code: 401, message: 'The transaction that was just attempted failed because it was not a valid batch transaction. Please contact the project’s developers.',
   },
   SIZE_ERROR: { code: 400, message: "There isn't enough space to open the popup" },
+  GET_BALANCE_ERROR: { code: 400, message: 'There was an error trying to fetch your balances.' },
   ...SILENT_ERRORS,
 };
diff --git a/source/Modules/Controller/information.js b/source/Modules/Controller/information.js
index 7a276348..44ff785f 100644
--- a/source/Modules/Controller/information.js
+++ b/source/Modules/Controller/information.js
@@ -28,13 +28,18 @@ export class InformationModule extends ControllerModuleBase {
     ];
   }
 
-  async #internalRequestBalance(accountId, callback) {
-    const getBalance = getKeyringHandler(HANDLER_TYPES.GET_BALANCE, this.keyring);
-    const icpBalance = await getBalance(accountId);
-    if (icpBalance.error) {
-      callback(ERRORS.SERVER_ERROR(icpBalance.error), null);
+  async #internalRequestBalance(subaccount, callback, portConfig) {
+    if (subaccount && Number.isNaN(parseInt(subaccount, 10))) {
+      callback(ERRORS.CLIENT_ERROR('Invalid account id'), null, portConfig);
     } else {
-      callback(null, icpBalance);
+      const getBalance = getKeyringHandler(HANDLER_TYPES.GET_BALANCE, this.keyring);
+
+      const balances = await getBalance(subaccount);
+      if (balances?.error) {
+        callback(ERRORS.GET_BALANCE_ERROR, null, portConfig);
+      } else {
+        callback(null, balances, portConfig);
+      }
     }
   }
 
@@ -44,14 +49,10 @@ export class InformationModule extends ControllerModuleBase {
       methodName: 'requestBalance',
       handler: async (opts, metadata, subaccount, transactionId) => {
         const { callback, message, sender } = opts;
-
         getApps(this.keyring?.currentWalletId.toString(), (apps = {}) => {
           const app = apps?.[metadata.url] || {};
-
           if (app?.status === CONNECTION_STATUS.accepted) {
-            if (subaccount && Number.isNaN(parseInt(subaccount, 10))) {
-              callback(ERRORS.CLIENT_ERROR('Invalid account id'), null);
-            } else if (!this.keyring?.isUnlocked) {
+            if (!this.keyring?.isUnlocked) {
               this.displayPopUp({
                 callId: message.data.data.id,
                 portId: sender.id,
@@ -78,22 +79,9 @@ export class InformationModule extends ControllerModuleBase {
         const { subaccount } = args;
         getApps(this.keyring?.currentWalletId.toString(), async (apps = {}) => {
           const app = apps?.[url] || {};
-          callback(null, true);
-
+          callback(null, true); // Close modal
           if (app?.status === CONNECTION_STATUS.accepted) {
-            const getBalance = getKeyringHandler(
-              HANDLER_TYPES.GET_BALANCE,
-              this.keyring,
-            );
-            const icpBalance = await getBalance(subaccount);
-
-            if (icpBalance.error) {
-              callback(ERRORS.SERVER_ERROR(icpBalance.error), null, [
-                { portId, callId },
-              ]);
-            } else {
-              callback(null, icpBalance, [{ portId, callId }]);
-            }
+            this.#internalRequestBalance(subaccount, callback, [{ portId, callId }]);
           } else {
             callback(ERRORS.CONNECTION_ERROR, null, [{ portId, callId }]);
           }

From d1f1963ac8f25c3b4c9b57cc2a763cc33d4a5b11 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Wed, 5 Oct 2022 13:15:43 -0600
Subject: [PATCH 086/132] Removed subaccount validation

---
 source/Modules/Controller/information.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/source/Modules/Controller/information.js b/source/Modules/Controller/information.js
index 44ff785f..d9dd8a2a 100644
--- a/source/Modules/Controller/information.js
+++ b/source/Modules/Controller/information.js
@@ -29,17 +29,12 @@ export class InformationModule extends ControllerModuleBase {
   }
 
   async #internalRequestBalance(subaccount, callback, portConfig) {
-    if (subaccount && Number.isNaN(parseInt(subaccount, 10))) {
-      callback(ERRORS.CLIENT_ERROR('Invalid account id'), null, portConfig);
+    const getBalance = getKeyringHandler(HANDLER_TYPES.GET_BALANCE, this.keyring);
+    const balances = await getBalance(subaccount);
+    if (balances?.error) {
+      callback(ERRORS.GET_BALANCE_ERROR, null, portConfig);
     } else {
-      const getBalance = getKeyringHandler(HANDLER_TYPES.GET_BALANCE, this.keyring);
-
-      const balances = await getBalance(subaccount);
-      if (balances?.error) {
-        callback(ERRORS.GET_BALANCE_ERROR, null, portConfig);
-      } else {
-        callback(null, balances, portConfig);
-      }
+      callback(null, balances, portConfig);
     }
   }
 

From 059d2b8b26ea88e862f3558a4692ea42cc99e832 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Wed, 5 Oct 2022 16:18:01 -0300
Subject: [PATCH 087/132] fixed emoji selector style

---
 .../Views/ImportWallet/Steps/Step2.jsx        | 119 +++++++++---------
 .../Extension/Views/ImportWallet/styles.js    |   4 +-
 2 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 850b243a..44da9811 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -1,12 +1,12 @@
-import { Container, Button, TextInput, FormItem, UserIcon } from '@components'
-import Grid from '@material-ui/core/Grid';
-import useStyles from '../styles';
-import React, { useState } from 'react';
-import { useRouter } from '@components/Router';
-import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import Picker from 'emoji-picker-react';
-import { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
+import { Container, Button, TextInput, FormItem, UserIcon } from "@components";
+import Grid from "@material-ui/core/Grid";
+import useStyles from "../styles";
+import React, { useState } from "react";
+import { useRouter } from "@components/Router";
+import { HANDLER_TYPES, sendMessage } from "@background/Keyring";
+import Picker from "emoji-picker-react";
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
 
 const Step2 = ({ userPemFile }) => {
   const { t } = useTranslation();
@@ -14,22 +14,21 @@ const Step2 = ({ userPemFile }) => {
   const [loading, setLoading] = useState(false);
   const [disabled, setDisabled] = useState(false);
   const [openEmojis, setOpenEmojis] = useState(false);
-  const [walletName, setWalletName] = useState(''); // add deafault wallet name, for example the next wallet not used number
-  const [currentEmoji, setCurrentEmoji] = useState('😎'); // add default emoji, not used in other wallets
+  const [walletName, setWalletName] = useState(""); // add deafault wallet name, for example the next wallet not used number
+  const [currentEmoji, setCurrentEmoji] = useState("😎"); // add default emoji, not used in other wallets
   const [openEmojiSelector, setOpenEmojiSelector] = useState(false);
 
   const { navigator } = useRouter();
-  
 
   const classes = useStyles();
-  
-    useEffect(() => {
-      if (walletName && walletName !== "") {
-        setDisabled(true);
-      } else {
-        setDisabled(false);
-      }
-    }, [currentEmoji, walletName]);
+
+  useEffect(() => {
+    if (walletName && walletName !== "") {
+      setDisabled(true);
+    } else {
+      setDisabled(false);
+    }
+  }, [currentEmoji, walletName]);
 
   const onEmojiClick = (_event, emojiObject) => {
     setCurrentEmoji(emojiObject.emoji);
@@ -38,16 +37,19 @@ const Step2 = ({ userPemFile }) => {
   };
 
   const createImportedAccount = (pemContent) => {
-    console.log(pemContent)
-    sendMessage({
-      type: HANDLER_TYPES.IMPORT_PEM_ACCOUNT,
-      params: {icon: currentEmoji, name: walletName, pem: pemContent},
-    }, (wallet) => {
-      console.log(wallet);
-    });
+    console.log(pemContent);
+    sendMessage(
+      {
+        type: HANDLER_TYPES.IMPORT_PEM_ACCOUNT,
+        params: { icon: currentEmoji, name: walletName, pem: pemContent },
+      },
+      (wallet) => {
+        console.log(wallet);
+      }
+    );
     setLoading(false);
-    navigator.navigate('home');
-  }
+    navigator.navigate("home");
+  };
 
   const readPemCreateAccount = () => {
     setLoading(true);
@@ -58,14 +60,14 @@ const Step2 = ({ userPemFile }) => {
       const content = fileReader.result; // we should check what happens if the user pass an empty pem file
       createImportedAccount(content);
     };
-  }
+  };
 
   return (
     <Container>
       <Grid container spacing={2}>
         <Grid item xs={12}>
           <div className={classes.chooseEmojiContainer}>
-            <UserIcon icon={currentEmoji} size='big' />
+            <UserIcon icon={currentEmoji} size="big" />
             <Button
               variant="primary"
               value={t("importPem.editWalletPic")}
@@ -76,40 +78,43 @@ const Step2 = ({ userPemFile }) => {
                 borderRadius: 6,
               }}
             />
-            {
-              openEmojiSelector && (
-                <Picker
-                  pickerStyle={{
-                    position: 'absolute',
-                    zIndex: 500,
-                    top: 180,
-                  }}
-                  onEmojiClick={onEmojiClick}
-                  native
-                  groupVisibility={{
-                    recently_used: false,
-                    flags: false,
-                  }}
-                />
-              )
-            }
+            {openEmojiSelector && (
+              <Picker
+                pickerStyle={{
+                  height: 190,
+                  width: "auto",
+                  position: "absolute",
+                  top: 180,
+                  left: 40,
+                  right: 40,
+                  zIndex: 500,
+                }}
+                onEmojiClick={onEmojiClick}
+                native
+                disableSearchBar
+                groupVisibility={{
+                  recently_used: false,
+                  flags: false,
+                }}
+              />
+            )}
           </div>
           <FormItem
             smallLabel
-            label={t('common.name')}
+            label={t("common.name")}
             className={classes.formItem}
-            component={(
+            component={
               <TextInput
                 fullWidth
-                onChange={e => setWalletName(e.target.value)}
+                onChange={(e) => setWalletName(e.target.value)}
                 type="text"
-              // error={}
+                // error={}
               />
-            )}
+            }
           />
           <Button
             variant="rainbow"
-            value={t('common.save')}
+            value={t("common.save")}
             onClick={() => readPemCreateAccount()}
             loading={loading}
             disabled={!disabled}
@@ -119,7 +124,7 @@ const Step2 = ({ userPemFile }) => {
         </Grid>
       </Grid>
     </Container>
-  )
-}
+  );
+};
 
-export default Step2
+export default Step2;
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index b1d5b18d..9d272b9c 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -39,13 +39,13 @@ export default makeStyles((theme) => ({
     width: '100%',
     gap: 14,
     marginTop: 10,
-    marginBottom: 25,
+    marginBottom: 30,
   },
   label: {
     width: 'auto',
   },
   formItem: {
-    marginBottom: 20,
+    marginBottom: 35,
   },
   inputFileLabel: {
     textDecorationLine: 'underline',

From 6b5d3cdf8a9016dcc1c03b90f8ca798b071a7cc0 Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Wed, 5 Oct 2022 15:43:02 -0500
Subject: [PATCH 088/132] Chore/update with 0.6.0 (#627)

* remove switch account icon (#613)

* automation fixes

* Installed controller and dabjs with icp standard fixes

* Fixed connect account modal (#618)

* Fix/Contacts (#616)

* WIP

* Code cleanup

* mend

* Fixed hiddenAccounts

* Fixed state accounts

* Fixed export identity

* Bumped controller version

* Added missing semicolon

* Plug controller bump

* Rollback controller to 0.22.3

* Fixed collection info and nft details issues

* Fixed popup & connect accounts info (#625)

* Abstracted internalRequestBalance and fixed issues with bigint parsing

* Removed subaccount validation

Co-authored-by: Alina Sytnik <alinasytnik1999@gmail.com>
Co-authored-by: Alina Sytnik <33018206+alinasytnik@users.noreply.github.com>
Co-authored-by: rocky-fleek <tomas@fleek.co>
Co-authored-by: tomiir <rocchitomas@gmail.com>
---
 .gitignore                                    |  3 +
 package.json                                  |  4 +-
 source/Background/Keyring/index.js            |  5 +-
 source/Background/errors.js                   |  1 +
 source/Modules/Controller/information.js      | 33 ++------
 source/Modules/storageManager.js              |  4 +-
 .../components/ConnectAccountItem/index.jsx   |  9 ++-
 .../components/ConnectAccountsModal/index.jsx | 26 ++++--
 .../ConnectAccountsModal/layout.jsx           |  4 +-
 .../components/ConnectionControls/index.jsx   |  5 +-
 source/components/IDInput/index.jsx           |  6 +-
 .../Profile/components/AccountItem/index.jsx  | 24 ++----
 source/components/Profile/index.jsx           |  8 +-
 .../Tokens/components/TokenSelector/index.jsx |  2 +-
 source/components/Tokens/index.jsx            |  2 +-
 source/hooks/index.js                         |  1 -
 source/hooks/useContacts.jsx                  | 22 -----
 source/redux/contacts.js                      | 46 +++++------
 .../views/Extension/Views/Contacts/index.jsx  |  7 +-
 .../Views/ExportIdentity/steps/Step2.jsx      |  6 +-
 source/views/Extension/Views/Home/index.jsx   | 18 ++++-
 source/views/Extension/Views/Login/index.jsx  |  7 +-
 .../Extension/Views/NFTDetails/index.jsx      | 39 +++++----
 .../views/Extension/Views/SendFlow/index.jsx  |  9 ++-
 .../SendNFT/components/InputStep/index.jsx    |  4 +-
 .../SendNFT/components/ReviewStep/index.jsx   |  8 +-
 .../Extension/Views/WalletDetails/index.jsx   | 11 ++-
 .../Popup/components/AllowAgent/index.jsx     |  2 +-
 .../Popup/components/AppConnection/index.jsx  |  2 +-
 .../views/Popup/components/BurnXTC/index.jsx  |  2 +-
 .../Popup/components/ImportToken/index.jsx    |  2 +-
 .../components/BatchTransactions/index.jsx    |  2 +-
 source/views/Popup/components/Sign/index.jsx  |  2 +-
 .../views/Popup/components/Transfer/index.jsx |  2 +-
 source/views/Popup/index.jsx                  |  2 +-
 tests/README.md                               | 80 +++++++++++++++++++
 tests/e2e/send-tokens.test.js                 |  8 ++
 yarn.lock                                     | 32 +++-----
 38 files changed, 256 insertions(+), 194 deletions(-)
 delete mode 100644 source/hooks/useContacts.jsx
 create mode 100644 tests/README.md

diff --git a/.gitignore b/.gitignore
index 091a2a97..1b57587b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,9 @@ typings/
 .env
 .env.test
 
+# PEM files
+*.pem
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 
diff --git a/package.json b/package.json
index 3f8833a5..9e1287a2 100644
--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
     "@material-ui/icons": "^4.11.2",
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
-    "@psychedelic/dab-js": "1.4.11",
-    "@psychedelic/plug-controller": "0.21.0",
+    "@psychedelic/dab-js": "1.4.12",
+    "@psychedelic/plug-controller": "0.22.3",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 5237d077..2522959a 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -233,7 +233,8 @@ export const getKeyringHandler = (type, keyring) => ({
       const assets = await keyring.getBalances({ subaccount: walletId });
       const parsedAssets = parseAssetsAmount(assets);
       const icpPrice = await getICPPrice();
-      return formatAssets(parsedAssets, icpPrice);
+      const formattedAssets = formatAssets(parsedAssets, icpPrice);
+      return formattedAssets.map((asset) => recursiveParseBigint(asset));
     } catch (error) {
       // eslint-disable-next-line
       console.log('Error when fetching token balances', error);
@@ -478,7 +479,7 @@ export const getKeyringHandler = (type, keyring) => ({
       console.log('Error removing the network', e);
       return { error: e.message };
     }
-  }
+  },
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {
diff --git a/source/Background/errors.js b/source/Background/errors.js
index 3f39ee0e..3977a721 100644
--- a/source/Background/errors.js
+++ b/source/Background/errors.js
@@ -27,5 +27,6 @@ export default {
     code: 401, message: 'The transaction that was just attempted failed because it was not a valid batch transaction. Please contact the project’s developers.',
   },
   SIZE_ERROR: { code: 400, message: "There isn't enough space to open the popup" },
+  GET_BALANCE_ERROR: { code: 400, message: 'There was an error trying to fetch your balances.' },
   ...SILENT_ERRORS,
 };
diff --git a/source/Modules/Controller/information.js b/source/Modules/Controller/information.js
index 7a276348..d9dd8a2a 100644
--- a/source/Modules/Controller/information.js
+++ b/source/Modules/Controller/information.js
@@ -28,13 +28,13 @@ export class InformationModule extends ControllerModuleBase {
     ];
   }
 
-  async #internalRequestBalance(accountId, callback) {
+  async #internalRequestBalance(subaccount, callback, portConfig) {
     const getBalance = getKeyringHandler(HANDLER_TYPES.GET_BALANCE, this.keyring);
-    const icpBalance = await getBalance(accountId);
-    if (icpBalance.error) {
-      callback(ERRORS.SERVER_ERROR(icpBalance.error), null);
+    const balances = await getBalance(subaccount);
+    if (balances?.error) {
+      callback(ERRORS.GET_BALANCE_ERROR, null, portConfig);
     } else {
-      callback(null, icpBalance);
+      callback(null, balances, portConfig);
     }
   }
 
@@ -44,14 +44,10 @@ export class InformationModule extends ControllerModuleBase {
       methodName: 'requestBalance',
       handler: async (opts, metadata, subaccount, transactionId) => {
         const { callback, message, sender } = opts;
-
         getApps(this.keyring?.currentWalletId.toString(), (apps = {}) => {
           const app = apps?.[metadata.url] || {};
-
           if (app?.status === CONNECTION_STATUS.accepted) {
-            if (subaccount && Number.isNaN(parseInt(subaccount, 10))) {
-              callback(ERRORS.CLIENT_ERROR('Invalid account id'), null);
-            } else if (!this.keyring?.isUnlocked) {
+            if (!this.keyring?.isUnlocked) {
               this.displayPopUp({
                 callId: message.data.data.id,
                 portId: sender.id,
@@ -78,22 +74,9 @@ export class InformationModule extends ControllerModuleBase {
         const { subaccount } = args;
         getApps(this.keyring?.currentWalletId.toString(), async (apps = {}) => {
           const app = apps?.[url] || {};
-          callback(null, true);
-
+          callback(null, true); // Close modal
           if (app?.status === CONNECTION_STATUS.accepted) {
-            const getBalance = getKeyringHandler(
-              HANDLER_TYPES.GET_BALANCE,
-              this.keyring,
-            );
-            const icpBalance = await getBalance(subaccount);
-
-            if (icpBalance.error) {
-              callback(ERRORS.SERVER_ERROR(icpBalance.error), null, [
-                { portId, callId },
-              ]);
-            } else {
-              callback(null, icpBalance, [{ portId, callId }]);
-            }
+            this.#internalRequestBalance(subaccount, callback, [{ portId, callId }]);
           } else {
             callback(ERRORS.CONNECTION_ERROR, null, [{ portId, callId }]);
           }
diff --git a/source/Modules/storageManager.js b/source/Modules/storageManager.js
index 1f5a5cf1..f35fb69b 100644
--- a/source/Modules/storageManager.js
+++ b/source/Modules/storageManager.js
@@ -159,12 +159,12 @@ export const getWalletsConnectedToUrl = (url, walletIds, cb) => {
     return;
   }
 
-  walletIds.forEach((id) => {
+  walletIds.forEach((id, index) => {
     getApp(id.toString(), url, (app = {}) => {
       if (app?.status === CONNECTION_STATUS.accepted) {
         wallets.push(id);
       }
-      if (id === walletIds.length - 1) {
+      if (index === walletIds.length - 1) {
         cb(wallets);
       }
     });
diff --git a/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx b/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx
index 0095716e..b7da819c 100644
--- a/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx
+++ b/source/components/ConnectAccountsModal/components/ConnectAccountItem/index.jsx
@@ -13,9 +13,14 @@ const ConnectAccountItem = ({
   connected, wallet, checked, onCheck, name,
 }) => {
   const classes = useStyles();
+
+  const handleCheckboxChange = (event) => {
+    !connected && onCheck(event, wallet.walletId);
+  };
+
   return (
     <div
-      key={wallet.walletNumber}
+      key={wallet.walletId}
       className={clsx(
         classes.flex,
         classes.walletContainer,
@@ -26,7 +31,7 @@ const ConnectAccountItem = ({
         <Checkbox
           className={classes.checkbox}
           checked={checked}
-          handleChange={!connected && onCheck(wallet.walletNumber)}
+          handleChange={handleCheckboxChange}
         />
         <UserIcon size="small" icon={wallet.icon} style={{ marginLeft: -6, marginRight: 12 }} />
         <Typography variant="h6" className={classes.walletName}>{name || ''}</Typography>
diff --git a/source/components/ConnectAccountsModal/index.jsx b/source/components/ConnectAccountsModal/index.jsx
index 19ac88e6..c2bdba91 100644
--- a/source/components/ConnectAccountsModal/index.jsx
+++ b/source/components/ConnectAccountsModal/index.jsx
@@ -36,8 +36,8 @@ const ConnectAccountsModal = ({
     getReverseResolvedNames();
   }, [wallets]);
 
-  const connectAccountToTab = (wallet) => {
-    getApps(wallet.walletNumber.toString(), (apps) => {
+  const connectAccountToTab = (walletId) => {
+    getApps(walletId.toString(), (apps) => {
       // If any other account is connected, create an entry for the current wallet
       const date = new Date().toISOString();
       const url = getTabURL(tab);
@@ -55,19 +55,33 @@ const ConnectAccountsModal = ({
           ],
         },
       };
-      setApps(wallet.walletNumber.toString(), newApps);
+      setApps(walletId.toString(), newApps);
     });
   };
 
+  const updateProviderConnection = async (walletId) => {
+    const currentWallet = wallets.find(w => w.walletId === walletId) || null;
+    if (currentWallet) {
+      extension.tabs.query({ active: true }, (activeTabs) => {
+        extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
+      });
+    }
+  };
+
   const handleConfirm = () => {
-    Object.keys(walletsToUpdate).forEach((walletId) => connectAccountToTab(wallets[walletId], tab));
+    Object.keys(walletsToUpdate).forEach((walletId) => {
+      if (walletsToUpdate[walletId]) {
+        connectAccountToTab(walletId, tab)
+        updateProviderConnection(walletId);
+      }
+    });
     onConfirm?.();
     setWalletsToUpdate({});
     setSelectAllWallets(false);
     onClose();
   };
 
-  const onCheckWallet = (walletId) => (event) => {
+  const onCheckWallet = (event, walletId) => {
     setWalletsToUpdate({
       ...walletsToUpdate,
       [walletId]: event.target.checked,
@@ -77,7 +91,7 @@ const ConnectAccountsModal = ({
   const handleSelectAll = (event) => {
     const newWalletsToUpdate = {};
     wallets.forEach((wallet) => {
-      newWalletsToUpdate[wallet.walletNumber] = event.target.checked;
+      newWalletsToUpdate[wallet.walletId] = event.target.checked;
     });
     setSelectAllWallets(event.target.checked);
     setWalletsToUpdate(newWalletsToUpdate);
diff --git a/source/components/ConnectAccountsModal/layout.jsx b/source/components/ConnectAccountsModal/layout.jsx
index 6090f288..3542d7cb 100644
--- a/source/components/ConnectAccountsModal/layout.jsx
+++ b/source/components/ConnectAccountsModal/layout.jsx
@@ -46,14 +46,14 @@ const ConnectAccountsModalLayout = ({
         onScroll={onScroll}
       >
         {wallets.map((wallet) => {
-          const alreadyConnected = connectedWallets.includes(wallet.walletNumber);
+          const alreadyConnected = connectedWallets.includes(wallet.walletId);
           return (
             <ConnectAccountItem
               name={icnsNames[wallet?.principal] || wallet?.name}
               wallet={wallet}
               connected={alreadyConnected}
               checked={
-                  !!walletsToUpdate[wallet.walletNumber]
+                  !!walletsToUpdate[wallet.walletId]
                   || alreadyConnected
                 }
               onCheck={onCheckWallet}
diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index 88b0eb93..786633f3 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -6,7 +6,6 @@ import extensionizer from 'extensionizer';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 
-import { useContacts } from '@hooks';
 import { useICPPrice } from '@redux/icp';
 import {
   setAssets,
@@ -18,6 +17,7 @@ import {
 } from '@redux/wallet';
 import { getApps } from '@modules/storageManager';
 import { getCurrentNetwork, getNetworks } from '@redux/network';
+import { getContacts } from '@redux/contacts';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { TABS, useRouter } from '@components/Router';
 import RefreshAsset from '@assets/icons/refresh.svg';
@@ -29,7 +29,6 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   const classes = useStyles();
   const icpPrice = useICPPrice();
   const dispatch = useDispatch();
-  const { getContacts } = useContacts();
   const { tabIndex } = disableNavigation ? {} : useRouter();
   const {
     principalId,
@@ -118,7 +117,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
 
     if (icpPrice) {
       // Contacts
-      getContacts(true);
+      dispatch(getContacts({ refresh: true }));
 
       loadAssets();
       loadCollections();
diff --git a/source/components/IDInput/index.jsx b/source/components/IDInput/index.jsx
index f33d7246..18d2642b 100644
--- a/source/components/IDInput/index.jsx
+++ b/source/components/IDInput/index.jsx
@@ -8,9 +8,8 @@ import { useTranslation } from 'react-i18next';
 
 import { CircularProgress, Grid } from '@material-ui/core';
 import { getRandomEmoji } from '@shared/constants/emojis';
-import { addContact as addContactAction } from '@redux/contacts';
+import { getContacts, addContact as addContactAction } from '@redux/contacts';
 
-import { useContacts } from '@hooks';
 import ActionDialog from '../ActionDialog';
 import ContactItem from '../ContactItem';
 import ContactList from '../ContactList';
@@ -26,7 +25,6 @@ const IDInput = ({
 }) => {
   const classes = useStyles();
   const { t } = useTranslation();
-  const { getContacts } = useContacts();
 
   const dispatch = useDispatch();
   const [selectedContact, setSelectedContact] = useState(null);
@@ -39,7 +37,7 @@ const IDInput = ({
   const { contactsLoading } = useSelector((state) => state.contacts);
 
   useEffect(() => {
-    getContacts();
+   dispatch(getContacts());
   }, []);
 
   const isUserAddress = useMemo(
diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 9779f47c..c2f00b8d 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -6,7 +6,6 @@ import { useHiddenAccounts, toggleAccountHidden } from '@redux/profile';
 
 import BluePencil from '@assets/icons/blue-pencil.svg';
 import InvisibleIcon from '@assets/icons/invisible.svg';
-import SwitchAccount from '@assets/icons/switch-account.svg';
 import VisibleIcon from '@assets/icons/visible.svg';
 
 import UserIcon from '../../../UserIcon';
@@ -23,12 +22,12 @@ const AccountItem = ({
   const hiddenAccounts = useHiddenAccounts();
   const dispatch = useDispatch();
 
-  const isHidden = hiddenAccounts.includes(account.walletNumber);
+  const isHidden = hiddenAccounts.includes(account.walletId);
 
-  const toggleAccountVisibility = (account) => (e) => {
+  const toggleAccountVisibility = (e, walletId) => {
     e.preventDefault();
     e.stopPropagation();
-    dispatch(toggleAccountHidden(account));
+    dispatch(toggleAccountHidden(walletId));
   };
 
   if (isHidden && !isEditing) return null;
@@ -36,8 +35,7 @@ const AccountItem = ({
   return (
     <div
       className={clsx(classes.accountItemContainer, isHidden && classes.hiddenAccount)}
-      itemNameTestId="account-name"
-      onClick={(e) => handleEditAccount(e, account)}
+      onClick={(e) => handleChangeAccount(e, account.walletId)}
     >
       <div className={classes.leftContainer}>
         <UserIcon
@@ -48,22 +46,14 @@ const AccountItem = ({
         <div
           className={classes.accountDetails}
         >
-          <span className={classes.accountName}>
+          <span className={classes.accountName} data-testid={`account-name-${account.name}`}>
             {account.icnsData.reverseResolvedName ? account.icnsData.reverseResolvedName : account.name }
           </span>
         </div>
       </div>
       <div className={classes.rightContainer}>
         <IconButton
-          disabled={isCurrentAccount || isHidden}
-          onClick={(e) => handleChangeAccount(e, account.walletId)}
-        >
-          <img
-            className={clsx((isCurrentAccount || isHidden) && classes.disabledIcon)}
-            src={SwitchAccount}
-          />
-        </IconButton>
-        <IconButton
+          data-testid={`edit-button-${account.name}`}
           disabled={isHidden}
           onClick={(e) => handleEditAccount(e, account)}
         >
@@ -74,7 +64,7 @@ const AccountItem = ({
         </IconButton>
         { isEditing && (
           <IconButton
-            onClick={toggleAccountVisibility(account.walletNumber)}
+            onClick={(e) => { toggleAccountVisibility(e, account.walletId) }}
           >
             <img src={isHidden ? InvisibleIcon : VisibleIcon} />
           </IconButton>
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index 39d99d8e..d1f39505 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -25,7 +25,8 @@ import { getWalletsConnectedToUrl, getApp } from '@modules/storageManager';
 import { setEditAccount, toggleAccountHidden, useHiddenAccounts } from '@redux/profile';
 import { setICNSData } from '@redux/icns';
 import { useICPPrice } from '@redux/icp';
-import { useMenuItems, useContacts } from '@hooks';
+import { getContacts } from '@redux/contacts';
+import { useMenuItems } from '@hooks';
 import ConnectAccountsModal from '../ConnectAccountsModal';
 import HoverAnimation from '../HoverAnimation';
 import MenuItem from '../MenuItem';
@@ -59,7 +60,6 @@ const Profile = ({ disableProfile }) => {
   const [accountName, setAccountName] = useState('');
   const [error, setError] = useState(null);
   const [connectedWallets, setConnectedWallets] = useState([]);
-  const { getContacts } = useContacts();
 
   const handleToggle = () => {
     setOpen((prevOpen) => !prevOpen);
@@ -119,7 +119,7 @@ const Profile = ({ disableProfile }) => {
         if (walletsArray.length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
-          getContacts();
+          dispatch(getContacts());
           dispatch(setICNSData(newWallet.icnsData));
           dispatch(setAssetsLoading(true));
           dispatch(setTransactions([]));
@@ -149,7 +149,7 @@ const Profile = ({ disableProfile }) => {
     setSelectedWallet(wallet);
     extensionizer.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => {
       const url = getTabURL(tabs?.[0]);
-      const ids = accounts.map((_, idx) => idx);
+      const ids = accounts.map((account) => account.walletId);
       setTab(tabs?.[0]);
       // Check if new wallet is connected to the current page
       getWalletsConnectedToUrl(url, ids, async (wallets = []) => {
diff --git a/source/components/Tokens/components/TokenSelector/index.jsx b/source/components/Tokens/components/TokenSelector/index.jsx
index bc463319..5f448236 100644
--- a/source/components/Tokens/components/TokenSelector/index.jsx
+++ b/source/components/Tokens/components/TokenSelector/index.jsx
@@ -27,7 +27,7 @@ const TokenSelector = ({ onClose }) => {
       <div
         onClick={() => navigator.navigate('add-nft')}
         className={classes.addNftButton}
-        data-testid="add-custom-token-button"
+        data-testid="add-custom-nft-button"
       >
         <img
           src={imageIcon}
diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index 85ae9ec7..7cd2bb01 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -106,7 +106,7 @@ const Tokens = () => {
       <div
         onClick={() => setDisplayCustomToken(!displayCustomToken)}
         className={classes.buttonWrapper}
-        data-testid="add-custom-token-button"
+        data-testid="add-button"
       >
         <Plus size="30" className={classes.icon} strokeWidth={2.5} />
       </div>
diff --git a/source/hooks/index.js b/source/hooks/index.js
index 800dfe1e..5c4c3f16 100644
--- a/source/hooks/index.js
+++ b/source/hooks/index.js
@@ -7,4 +7,3 @@ export { default as useActivity } from './useActivity';
 export { default as useDebounce } from './useDebounce';
 export { default as useICNS } from './useICNS';
 export { default as useScroll } from './useScroll';
-export { default as useContacts } from './useContacts';
diff --git a/source/hooks/useContacts.jsx b/source/hooks/useContacts.jsx
deleted file mode 100644
index 40b973e6..00000000
--- a/source/hooks/useContacts.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useDispatch } from 'react-redux';
-import { getContacts as getReduxContacts } from '@redux/contacts';
-import { getDabContacts } from '@modules/storageManager';
-
-const useContacts = () => {
-  const dispatch = useDispatch();
-
-  const getContacts = (refresh = false) => {
-    getDabContacts((contactList) => {
-      dispatch(getReduxContacts({
-        localContacts: contactList,
-        refresh,
-      }));
-    });
-  };
-
-  return {
-    getContacts,
-  };
-};
-
-export default useContacts;
diff --git a/source/redux/contacts.js b/source/redux/contacts.js
index 818837d8..27118136 100644
--- a/source/redux/contacts.js
+++ b/source/redux/contacts.js
@@ -1,9 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { buildContactObject, parseContactFromDab } from '@shared/utils/contacts';
-import {
-  setDabContacts as setLocalDabContacts,
-} from '@modules/storageManager';
 import {
   getContacts as callGetContacts,
   addContact as callAddContact,
@@ -88,6 +85,7 @@ export const contactSlice = createSlice({
     contacts: [],
     groupedContacts: [],
     contactsLoading: false,
+    pendingDelete: false,
   },
   reducers: { },
   extraReducers: (builder) => {
@@ -96,8 +94,6 @@ export const contactSlice = createSlice({
         const contact = action.meta.arg;
         const newContactList = [...state.contacts, contact];
 
-        setLocalDabContacts(newContactList);
-
         state.contacts = newContactList;
         state.groupedContacts = groupContacts(newContactList);
       })
@@ -105,51 +101,47 @@ export const contactSlice = createSlice({
         const contact = action.meta.arg;
         const filteredContacts = state.contacts.filter((c) => c.id === contact.id);
 
-        setLocalDabContacts(filteredContacts);
-
         state.contacts = filteredContacts;
         state.groupedContacts = groupContacts(filteredContacts);
       })
       .addCase(getContacts.pending, (state, action) => {
-        state.contactsLoading = true;
-        if (action.meta.arg.refresh) {
+        if (action.meta.arg?.refresh) {
           state.contacts = [];
           state.groupedContacts = [];
-          setLocalDabContacts([]);
-        } else {
-          state.contacts = action.meta.arg.localContacts;
-          state.groupedContacts = groupContacts(action.meta.arg.localContacts);
         }
+        state.contactsLoading = true;
       })
       .addCase(getContacts.fulfilled, (state, action) => {
-        let newContactList = [
-          ...state?.contacts,
-          ...action?.payload,
-          ...action.meta.arg?.localContacts,
-        ];
-        newContactList = filterContactsById(newContactList);
-        setLocalDabContacts(newContactList);
-
-        state.contacts = newContactList;
-        state.groupedContacts = groupContacts(newContactList);
+        // Doesn't update contact list if removeContact is pending
+        if (!state.pendingDelete) {
+          let newContactList = [
+            ...state?.contacts,
+            ...action?.payload,
+          ];
+          newContactList = filterContactsById(newContactList);
+
+          state.contacts = newContactList;
+          state.groupedContacts = groupContacts(newContactList);
+        }
         state.contactsLoading = false;
       })
       .addCase(removeContact.pending, (state, action) => {
         const contact = action.meta.arg;
         const filteredContacts = state.contacts.filter((c) => c.name !== contact.name);
 
-        setLocalDabContacts(filteredContacts);
-
+        state.pendingDelete = true;
         state.contacts = filteredContacts;
         state.groupedContacts = groupContacts(filteredContacts);
       })
+      .addCase(removeContact.fulfilled, (state, action) => {
+        state.pendingDelete = false;
+      })
       .addCase(removeContact.rejected, (state, action) => {
         const contact = action.meta.arg;
 
         const newContactList = [...state.contacts, contact];
 
-        setLocalDabContacts(newContactList);
-
+        state.pendingDelete = false;
         state.contacts = newContactList;
         state.groupedContacts = groupContacts(newContactList);
       });
diff --git a/source/views/Extension/Views/Contacts/index.jsx b/source/views/Extension/Views/Contacts/index.jsx
index 0d0bfc87..4c86326e 100644
--- a/source/views/Extension/Views/Contacts/index.jsx
+++ b/source/views/Extension/Views/Contacts/index.jsx
@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux'
 import { Layout, Header } from '@components';
-import { useContacts } from '@hooks';
+import { getContacts } from '@redux/contacts';
 import useSteps from './hooks/useSteps';
 
 const Contacts = () => {
@@ -10,9 +11,9 @@ const Contacts = () => {
     right,
     center,
   } = useSteps();
-  const { getContacts } = useContacts();
+  const dispatch = useDispatch();
 
-  useEffect(getContacts, []);
+  useEffect(() => { dispatch(getContacts()); }, []);
 
   return (
     <Layout>
diff --git a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
index 8b8cd856..9e20d382 100644
--- a/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
+++ b/source/views/Extension/Views/ExportIdentity/steps/Step2.jsx
@@ -21,7 +21,7 @@ const Step2 = () => {
 
   const handleCloseAccounts = (value) => {
     setOpenAccounts(false);
-    setSelectedAccountId(value.walletNumber);
+    setSelectedAccountId(value.walletId);
   };
 
   const handleDownloadPemFile = () => {
@@ -36,7 +36,7 @@ const Step2 = () => {
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.values(state?.wallets).length) {
           setAccounts(state.wallets);
           setSelectedAccountId(state.currentWalletId);
         }
@@ -66,7 +66,7 @@ const Step2 = () => {
           />
           <Dialog
             title={t('exportIdentity.selectAccount')}
-            items={accounts.map((a) => ({
+            items={Object.values(accounts).map((a) => ({
               ...a,
               icon: <UserIcon size="small" icon={a.icon} style={{ marginLeft: -6, marginRight: 12 }} />,
               endText: shortAddress(a.principal),
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 7e47441f..17aad961 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -80,7 +80,7 @@ const Home = () => {
     extension.tabs.query({ active: true, lastFocusedWindow: true }, (browserTabs) => {
       const currentTab = browserTabs?.[0];
       const url = getTabURL(currentTab);
-      const ids = state.wallets.map((_, idx) => idx);
+      const ids = Object.values(state.wallets).map((account) => account.walletId);
       setTab(currentTab);
       getWalletsConnectedToUrl(url, ids, (_connectedWallets = []) => {
         setConnectedWallets(_connectedWallets);
@@ -98,7 +98,8 @@ const Home = () => {
   };
 
   const updateProviderConnection = async () => {
-    const currentWallet = wallets?.[walletId] || null;
+    const currentWallet = wallets.find(w => w.walletId === walletId) || null;
+
     if (currentWallet) {
       extension.tabs.query({ active: true }, (activeTabs) => {
         extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
@@ -115,7 +116,7 @@ const Home = () => {
         isClockInSync().then((isInSync) => !isInSync && navigator.navigate('clockError'));
         validateProviderConnection(state);
       } else if (!migratedWalletId) {
-        state.wallets.forEach((wallet) => {
+        Object.values(state.wallets).forEach((wallet) => {
           updateWalletId(wallet.walletNumber, wallet.walletId);
         }); 
       }
@@ -130,8 +131,19 @@ const Home = () => {
     getUseICNS(walletId, (useICNS) => {
       dispatch(setUseICNS(useICNS));
     });
+    updateProviderConnection();
   }, [walletId]);
 
+  useEffect(() => {
+    sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
+      (state) => {
+        const walletsArray = Object.values(state?.wallets);
+        if (walletsArray?.length) {
+          setWallets(walletsArray);
+        }
+      });
+  }, []);
+
   return (
     <Layout>
       <Actions visible={tabIndex === 0} />
diff --git a/source/views/Extension/Views/Login/index.jsx b/source/views/Extension/Views/Login/index.jsx
index 33ca75f1..76446248 100644
--- a/source/views/Extension/Views/Login/index.jsx
+++ b/source/views/Extension/Views/Login/index.jsx
@@ -10,9 +10,9 @@ import {
 import { useRouter } from '@components/Router';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { setAccountInfo } from '@redux/wallet';
+import { getContacts } from '@redux/contacts';
 import { isClockInSync } from '@shared/utils/time';
 import { syncContactsToDab } from '@shared/utils/contacts';
-import { useContacts } from '@hooks';
 
 import PropTypes from 'prop-types';
 import useStyles from './styles';
@@ -22,7 +22,6 @@ const Login = ({ redirect }) => {
   const dispatch = useDispatch();
   const { t } = useTranslation();
   const { navigator } = redirect ? {} : useRouter();
-  const { getContacts } = useContacts();
 
   const [password, setPassword] = useState('');
   const [error, setError] = useState(false);
@@ -39,7 +38,7 @@ const Login = ({ redirect }) => {
     }, (unlocked) => {
       if (unlocked) {
         // Upload contacts
-        syncContactsToDab().then(getContacts());
+        syncContactsToDab().then(dispatch(getContacts()));
 
         isClockInSync()
           .then((isInRange) => {
@@ -51,7 +50,7 @@ const Login = ({ redirect }) => {
           type: HANDLER_TYPES.GET_STATE,
           params: { },
         }, (state) => {
-          if (state?.wallets?.length) {
+          if (Object.keys(state?.wallets).length) {
             dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
           }
         });
diff --git a/source/views/Extension/Views/NFTDetails/index.jsx b/source/views/Extension/Views/NFTDetails/index.jsx
index 414388a5..67809625 100644
--- a/source/views/Extension/Views/NFTDetails/index.jsx
+++ b/source/views/Extension/Views/NFTDetails/index.jsx
@@ -1,8 +1,10 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import {
   Layout,
   Header, Button, Badge, LinkButton, NFTDisplayer, ICNSDisplay,
 } from '@components';
+import { HttpAgent } from '@dfinity/agent';
+import { getNFTActor } from '@psychedelic/dab-js';
 import { useTranslation } from 'react-i18next';
 import BackIcon from '@assets/icons/back.svg';
 import ExpandIcon from '@assets/icons/expand.svg';
@@ -21,11 +23,19 @@ import { NFT_COLLECTION_DEFAULT_TYPES } from '@shared/constants/nft';
 import Section from './components/section';
 import useStyles from './styles';
 
+const getTokenDetails = async ({ index, canister, standard }) => {
+  const agent = new HttpAgent({ host: 'https://ic0.app/' });
+  const NFTActor = getNFTActor({ canisterId: canister, standard, agent });
+  const details = await NFTActor.details(index);
+  return details;
+}
+
 const NFTDetails = () => {
   const { t } = useTranslation();
   const { selectedNft: nft } = useSelector((state) => state.nfts);
   const { collections } = useSelector((state) => state.wallet);
   const { navigator: routerNavigator } = useRouter();
+  const [populatedNFT, setPopulatedNFT] = useState(nft);
   const classes = useStyles();
   const dispatch = useDispatch();
   if (!nft) {
@@ -38,15 +48,15 @@ const NFTDetails = () => {
     routerNavigator.navigate('home', TABS.NFTS);
   };
 
-  const collection = useMemo(() => collections?.find((col) => col.name === nft?.collection),
+  const collection = useMemo(() => collections?.find((col) => col.canisterId === nft?.canister),
     [collections, nft]);
 
   const name = `${nft?.name ?? `#${nft?.index}`}`;
-  const isICNS = nft?.collection === 'ICNS';
+  const isICNS = collection?.name === 'ICNS';
 
   const openNFT = (url) => {
     const parsedUrl = isICNS
-      ? `https://icns.id/domains/${nft?.name.replace('.icp', '')}/detail`
+      ? `https://icns.id/domains/${populatedNFT?.name.replace('.icp', '')}/detail`
       : url;
 
     extension.tabs.create({
@@ -59,10 +69,11 @@ const NFTDetails = () => {
   // eslint-disable-next-line no-confusing-arrow
   const handleButtonClick = (url) => isICNS ? openNFT(url) : copyNFT(url);
 
-  const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[nft.canisterId];
+  const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[populatedNFT.canisterId];
 
   useEffect(() => {
     window.scrollTo(0, 0);
+    getTokenDetails(nft).then((details) => setPopulatedNFT({ ...nft, ...details }));
   }, []);
 
   return (
@@ -75,16 +86,16 @@ const NFTDetails = () => {
             className={classes.expandIcon}
             src={ExpandIcon}
             data-testid="expand-nft"
-            onClick={() => openNFT(nft?.url?.replace('type=thumbnail', ''))}
+            onClick={() => openNFT(populatedNFT?.url?.replace('type=thumbnail', ''))}
             data-testid="expand-nft"
           />
         )}
       />
       <div className={classes.container}>
         {isICNS ? (
-          <ICNSDisplay icns={nft} className={classes.image} large />
+          <ICNSDisplay icns={populatedNFT} className={classes.image} large />
         ) : (
-          <NFTDisplayer url={nft?.url} className={classes.image} defaultTag={nftDefaultTag} interactive />
+          <NFTDisplayer url={populatedNFT?.url} className={classes.image} defaultTag={nftDefaultTag} interactive />
         )}
         <div className={classes.buttonContainer}>
           <Button
@@ -92,7 +103,7 @@ const NFTDetails = () => {
             value={t(`nfts.${isICNS ? 'manage' : 'copyLink'}`)}
             style={{ width: '96%' }}
             fullWidth
-            onClick={() => handleButtonClick(nft?.url?.replace('type=thumbnail', ''))}
+            onClick={() => handleButtonClick(populatedNFT?.url?.replace('type=thumbnail', ''))}
             buttonTestId="copy-link-button"
             endIcon={isICNS && (
               <ArrowUpRight
@@ -112,18 +123,18 @@ const NFTDetails = () => {
           />
         </div>
         <Section icon={CollectionImg} title={t('nfts.collection')}>
-          <Badge value={nft?.collection} icon={collection?.icon} iconClassName={classes.icnsIcon} />
+          <Badge value={collection?.name} icon={collection?.icon} iconClassName={classes.icnsIcon} />
           <Badge value={name} />
         </Section>
-        {!!nft?.desc && (
+        {!!populatedNFT?.desc && (
           <Section icon={DescriptionImg} title={t('nfts.description')}>
-            <Typography variant="subtitle1">{nft?.desc}</Typography>
+            <Typography variant="subtitle1">{populatedNFT?.desc}</Typography>
           </Section>
         )}
-        {nft?.metadata?.properties?.filter((prop) => typeof prop?.value !== 'object')?.length >= 1 && (
+        {populatedNFT?.metadata?.properties?.filter((prop) => typeof prop?.value !== 'object')?.length >= 1 && (
           <Section icon={AttributesImg} title={t('nfts.attributes')}>
             {
-              nft?.metadata?.properties?.map((prop) => ((
+              populatedNFT?.metadata?.properties?.map((prop) => ((
                 <Badge
                   name={prop.name}
                   value={prop?.value}
diff --git a/source/views/Extension/Views/SendFlow/index.jsx b/source/views/Extension/Views/SendFlow/index.jsx
index 8a3664a1..fa40222b 100644
--- a/source/views/Extension/Views/SendFlow/index.jsx
+++ b/source/views/Extension/Views/SendFlow/index.jsx
@@ -1,18 +1,21 @@
 import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { getContacts } from '@redux/contacts';
 import { Layout, Header } from '@components';
-import { useContacts } from '@hooks';
 import useSteps from './hooks/useSteps';
 
 const Send = () => {
-  const { getContacts } = useContacts();
   const {
     component,
     left,
     right,
     center,
   } = useSteps();
+  const dispatch = useDispatch();
 
-  useEffect(getContacts, []);
+  useEffect(() => {
+    dispatch(getContacts());
+  }, []);
 
   return (
     <Layout>
diff --git a/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx b/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx
index 64c1fd2c..d272ad43 100644
--- a/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/InputStep/index.jsx
@@ -32,7 +32,7 @@ const InputStep = ({ advanceStep }) => {
     || [principalId, accountId].includes(resolvedAddress);
 
   const collection = useMemo(() => collections?.find(
-    (col) => col.name === nft?.collection,
+    (col) => col.canisterId === nft?.canister,
   ) || {},
   [collections, nft]);
 
@@ -64,7 +64,7 @@ const InputStep = ({ advanceStep }) => {
                 name={nft?.name || `${collection?.name ?? ''} #${nft?.index}`}
                 text={`#${nft?.index}`}
                 imageClassName={classes.nftImage}
-                nft={nft}
+                nft={{ ...nft, collection: collection?.name }}
                 readonly
                 shadow
               />
diff --git a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
index 7aa2e63d..79bf46f1 100644
--- a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
@@ -10,7 +10,7 @@ import {
 } from '@components';
 import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
 import { blockNFTFetch, setCollections } from '@redux/wallet';
-import { setSelectedNft } from '@redux/nfts';
+import nfts, { setSelectedNft } from '@redux/nfts';
 import { ADDRESS_TYPES } from '@shared/constants/addresses';
 
 import NFTDisplay from '../NFTDisplay';
@@ -27,8 +27,8 @@ const ReviewStep = () => {
   const { selectedNft: nft, sendAddress, resolvedSendAddress } = useSelector((state) => state.nfts);
 
   const collection = useMemo(() => collections?.find(
-    (col) => col.name === nft?.collection,
-  ) || {},
+      (col) => col.canisterId === nft?.canister,
+    ) || {},
   [collections, nft]);
 
   const transferNFT = () => {
@@ -57,7 +57,7 @@ const ReviewStep = () => {
 
   return (
     <div className={classes.reviewStepContainer}>
-      <NFTDisplay nft={nft} />
+      <NFTDisplay nft={{ ...nft, collection: collection?.name }} />
       <AddressTranslation addresses={addresses} loading={loading} />
       <Button
         variant="rainbow"
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 34411ff0..cc66d54f 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -21,8 +21,8 @@ import {
   updateWalletDetails,
 } from '@redux/wallet';
 import { useICPPrice } from '@redux/icp';
+import { getContacts } from '@redux/contacts';
 import { setICNSData, setUseICNS as setReduxUseICNS } from '@redux/icns';
-import { useContacts } from '@hooks';
 
 import BlueCheck from '@assets/icons/blue-check.svg';
 import Pencil from '@assets/icons/pencil.svg';
@@ -52,7 +52,6 @@ const WalletDetails = () => {
     names: reduxNames,
   } = useSelector((state) => state.icns);
   const dispatch = useDispatch();
-  const { getContacts } = useContacts();
   const icpPrice = useICPPrice();
 
   const { editAccount } = useSelector((state) => state.profile);
@@ -217,7 +216,7 @@ const WalletDetails = () => {
   const handleChangeAccount = () => {
     extensionizer.tabs.query({ active: true, lastFocusedWindow: true }, (tabs) => {
       const url = getTabURL(tabs?.[0]);
-      const ids = accounts.map((_, idx) => idx);
+      const ids = accounts.map((account) => account.walletId);
       setTab(tabs?.[0]);
       // Check if new wallet is connected to the current page
       setAccountSwitchId(walletId);
@@ -253,7 +252,7 @@ const WalletDetails = () => {
         if (Object.values(state?.wallets).length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
-          getContacts();
+          dipatch(getContacts());
           dispatch(setICNSData(newWallet.icnsData));
           dispatch(setAssetsLoading(true));
           dispatch(setTransactions([]));
@@ -276,7 +275,7 @@ const WalletDetails = () => {
 
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets)?.length) {
         setAccounts(state.wallets);
       }
     });
@@ -354,7 +353,6 @@ const WalletDetails = () => {
                 { walletId !== activeWalletId && (
                   <button
                     type="button"
-                    data-testid="edit-icon-button"
                     onClick={handleChangeAccount}
                   >
                     <img
@@ -364,6 +362,7 @@ const WalletDetails = () => {
                 )}
                 {
                   <button
+                    data-testid="edit-icon-button"
                     type="button"
                     onClick={openEditWalletName}
                   >
diff --git a/source/views/Popup/components/AllowAgent/index.jsx b/source/views/Popup/components/AllowAgent/index.jsx
index bb24b0ba..d4578efd 100644
--- a/source/views/Popup/components/AllowAgent/index.jsx
+++ b/source/views/Popup/components/AllowAgent/index.jsx
@@ -81,7 +81,7 @@ const AllowAgent = ({
       });
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/components/AppConnection/index.jsx b/source/views/Popup/components/AppConnection/index.jsx
index 36ed8610..0842dfff 100644
--- a/source/views/Popup/components/AppConnection/index.jsx
+++ b/source/views/Popup/components/AppConnection/index.jsx
@@ -100,7 +100,7 @@ const AppConnection = ({ setOnTimeout, transactionId, metadata }) => {
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.keys(state?.wallets).length) {
           dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
         }
       });
diff --git a/source/views/Popup/components/BurnXTC/index.jsx b/source/views/Popup/components/BurnXTC/index.jsx
index b40f9489..5a3ed8a7 100644
--- a/source/views/Popup/components/BurnXTC/index.jsx
+++ b/source/views/Popup/components/BurnXTC/index.jsx
@@ -48,7 +48,7 @@ const BurnXTC = ({
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.keys(state?.wallets).length) {
           dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
         }
       });
diff --git a/source/views/Popup/components/ImportToken/index.jsx b/source/views/Popup/components/ImportToken/index.jsx
index bb4ec136..6b63259b 100644
--- a/source/views/Popup/components/ImportToken/index.jsx
+++ b/source/views/Popup/components/ImportToken/index.jsx
@@ -63,7 +63,7 @@ const ImportToken = ({
       handleImportToken(CONNECTION_STATUS.refused);
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx b/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
index e457fa89..f58798ab 100644
--- a/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
+++ b/source/views/Popup/components/Sign/components/BatchTransactions/index.jsx
@@ -55,7 +55,7 @@ const BatchTransactions = ({
 
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/components/Sign/index.jsx b/source/views/Popup/components/Sign/index.jsx
index bb2b2b9a..e5d1995b 100644
--- a/source/views/Popup/components/Sign/index.jsx
+++ b/source/views/Popup/components/Sign/index.jsx
@@ -87,7 +87,7 @@ const AssetsWarning = ({
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} },
       (state) => {
-        if (state?.wallets?.length) {
+        if (Object.keys(state?.wallets).length) {
           dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
         }
       });
diff --git a/source/views/Popup/components/Transfer/index.jsx b/source/views/Popup/components/Transfer/index.jsx
index bb826ccc..68dfb220 100644
--- a/source/views/Popup/components/Transfer/index.jsx
+++ b/source/views/Popup/components/Transfer/index.jsx
@@ -45,7 +45,7 @@ const Transfer = ({
       handleDeclineAll();
     });
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-      if (state?.wallets?.length) {
+      if (Object.keys(state?.wallets).length) {
         dispatch(setAccountInfo(state.wallets[state.currentWalletId]));
       }
     });
diff --git a/source/views/Popup/index.jsx b/source/views/Popup/index.jsx
index e759d1af..43538e7e 100644
--- a/source/views/Popup/index.jsx
+++ b/source/views/Popup/index.jsx
@@ -53,7 +53,7 @@ const NotificationContainer = () => {
   useEffect(() => {
     try {
       sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
-        if (state?.wallets?.length) {
+        if (Object.values(state?.wallets).length) {
           sendMessage({ type: HANDLER_TYPES.GET_LOCKS, params: {} }, (locks) => {
             if (locks?.isUnlocked) {
               setLoggedIn(true);
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 00000000..88857116
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,80 @@
+![Plug Banner](https://storageapi.fleek.co/fleek-team-bucket/plug-banner.png)
+
+# 🔌 Plug Extension - E2E Tests
+
+[![Fleek](https://img.shields.io/badge/Made%20by-Fleek-blue)](https://fleek.co/)
+[![Discord](https://img.shields.io/badge/Discord-Channel-blue)](https://discord.gg/yVEcEzmrgm)
+
+## 📖 Introduction
+
+This folder contains E2E tests for Plug Extensions written using Puppeteer.
+
+#### ✅ Covered functionalities:
+
+- Create wallet
+- Import wallet
+- Send tokens
+- Send custom tokens
+- Send NFTs
+- Deposit view
+- Add custom token
+- Add network
+- Edit account
+- Create account
+- Lock wallet
+- Settings: Contacts
+- Settings: Secret Recovery Phrase
+- Settings: Network
+- Settings: Export DFX Identity 
+- Settings: Help 
+
+## ⚙️ Development
+
+You need to perform following actions to start developing new tests:
+
+1. Clone Plug Extension repository
+2. Install dependencies by running `yarn`
+3. Switch directory `cd tests`
+4. Create new Plug Extension build by running `yarn build`
+5. Run tests with `yarn test` or `yarn test:watch` command.
+6. Enjoy! 🙌
+
+> ⚠️ IMPORTANT NOTE:
+Tests couldn't be used in CI/CD process due to lack of headless mode for extensions, so they should be run in the release branch before the merge
+
+### 📗 Elements selection 
+
+### <em> Elements Must Be Selectable by <strong> data-testid</strong> property</em>, e.g:
+
+```html
+<Button data-testid="add-network-button" variant="rainbow" onClick={handleAddNetwork} /> 
+```
+
+### 🔐 Environment variables 
+
+| Variable        | Usage      |
+| ------------- |:-------------:| 
+| `SEEDPHRASE`      | Seedphrase to unlock test wallet |
+| `MAIN_PRINCIPAL_ID`     | Principal ID of test wallet main account      |  
+| `MAIN_ACCOUNT_ID` | Account ID of test wallet main account      | 
+| `SUB_PRINCIPAL_ID` | Principal ID of test wallet sub account      | 
+| `SUB_ACCOUNT_ID` | Account ID of test wallet sub account      | 
+| `ICNS_NAME` | ICNS name | 
+| `PASSWORD` | Wallet password      | 
+| `DUST_CANISTER_ID` | DUST Canister ID      | 
+| `BETA_CANISTER_ID` |   BETA Canister ID  | 
+| `WTC_CANISTER_ID` | WTC Canister ID      | 
+| `XTC_CANISTER_ID` | XTC Canister ID      | 
+| `WICP_CANISTER_ID` | WICP Canister ID      | 
+| `TEST_COIN_CANISTER_ID` | TEST Canister ID      | 
+| `WRONG_ID` | Wrong Principal ID     | 
+| `WRONG_ACCOUNT_ID` | Wrong Account ID      | 
+| `WRONG_CANISTER_ID` | Wrong Canister ID      | 
+| `WRONG_ICNS_NAME` | Non-existing ICNS name      |
+| `NETWORK_NAME` | Network name      |
+| `HOST_NAME` | Network Host name      |
+| `CANISTER_ID` | Network Canister ID     |
+| `WRONG_HOST_NAME` | Wrong Network Host name      |
+
+
+
diff --git a/tests/e2e/send-tokens.test.js b/tests/e2e/send-tokens.test.js
index 982354ee..68ff803c 100644
--- a/tests/e2e/send-tokens.test.js
+++ b/tests/e2e/send-tokens.test.js
@@ -21,6 +21,11 @@ const waitForBalanceChange = async (page) => {
   await page.waitForTimeout(40000);
 };
 
+const addButtonClick = async (page) => {
+  const addTokenButton = await page.getByTestId('add-button', true);
+  await addTokenButton.click();
+};
+
 const addCustomTokenButtonClick = async (page) => {
   const addCustomTokenButton = await page.getByTestId('add-custom-token-button', true);
   await addCustomTokenButton.click();
@@ -72,6 +77,7 @@ const selectNetworkCardClick = async (page, name) => {
 };
 
 async function addCustomToken(page, { name, canisterId, standard }) {
+  await addButtonClick(page);
   await addCustomTokenButtonClick(page);
   await addCustomTokenTabItemClick(page, 'Custom');
 
@@ -316,6 +322,7 @@ describe('Send Custom Tokens', () => {
   });
 
   test('entering wrong token standard', async () => {
+    await addButtonClick(page);
     await addCustomTokenButtonClick(page);
 
     for (const { canisterId, standard } of wrongTokenData) {
@@ -362,6 +369,7 @@ describe('Send Custom Tokens', () => {
   });
 
   test('entering wrong custom token canister ID ', async () => {
+    await addButtonClick(page);
     await addCustomTokenButtonClick(page);
     await addCustomTokenTabItemClick(page, 'Custom');
 
diff --git a/yarn.lock b/yarn.lock
index e46fd908..759e242e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1773,10 +1773,10 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js@1.4.10":
-  version "1.4.10"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.10/ab2728aa672012b6889bbfc2730e63149517e965#ab2728aa672012b6889bbfc2730e63149517e965"
-  integrity sha512-OBVif7y1qAk4ZPeB7bEeQGbDgUuNpwndGU86N8dNsoAmrgrHpNb47DGHnH9Rs6KG7fPMBnNed15BUBzCRVKR2Q==
+"@psychedelic/dab-js@1.4.12":
+  version "1.4.12"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.12/ee252e693f8606327f479cbbdbfe8424b422e8f5#ee252e693f8606327f479cbbdbfe8424b422e8f5"
+  integrity sha512-oJwMbgafesO5KOBoV70oQ929wel18n0X6u/IBtR7mcBa0SdwM2uyhbgjNqVLpFdBaVBRoAxKdCABc4sVRcqglg==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
@@ -1787,31 +1787,17 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/dab-js@1.4.11":
-  version "1.4.11"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.11/e6800b2304edc64299407ec32f5749b1f30ec60b#e6800b2304edc64299407ec32f5749b1f30ec60b"
-  integrity sha512-lWNRBSbJCjDKOG+xNwcL809TUguoJM8jGhPlxhIBwoy5u2RZrMcMQ7DmlpKkUsXqi5VGEiP25Ud23pPPjejc+w==
-  dependencies:
-    "@dfinity/agent" "0.9.3"
-    "@dfinity/candid" "0.9.3"
-    "@dfinity/identity" "0.9.3"
-    "@dfinity/principal" "0.9.3"
-    axios "^0.24.0"
-    buffer-crc32 "^0.2.13"
-    cross-fetch "^3.1.4"
-    crypto-js "^4.1.1"
-
-"@psychedelic/plug-controller@0.21.0":
-  version "0.21.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.21.0/48e547f647bcbd1723cd4536688bf07811b15ee7#48e547f647bcbd1723cd4536688bf07811b15ee7"
-  integrity sha512-L/Jkrl7tjIosZth1IKj5d0m+pTbsB+y1LgFRpI1LJsXEoWbgzEjwsesgeN5BvNNbqW+SMPTPcUusk+Fug6WaFA==
+"@psychedelic/plug-controller@0.22.3":
+  version "0.22.3"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.3/0de97b56824db0aab742fbe5a69fe44eb0edee8c#0de97b56824db0aab742fbe5a69fe44eb0edee8c"
+  integrity sha512-1mP7hEnzKBll/3r70vCh8v/v+Yby/G6rx5TFBIbVB4Wkx+H23wQi+pF0LeQk8oBL/Z+3PApfXjiCQ/YSxlZBAQ==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.10"
+    "@psychedelic/dab-js" "1.4.12"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"

From 882e37ef647b558b34a5e1e6866581f7db6517a3 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Wed, 5 Oct 2022 18:22:43 -0600
Subject: [PATCH 089/132] Installed controller 0.22.5 with Principal
 serializatio on pid contacts

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

diff --git a/package.json b/package.json
index 9e1287a2..70befff0 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.22.3",
+    "@psychedelic/plug-controller": "0.22.5",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 759e242e..ebb95e51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.22.3":
-  version "0.22.3"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.3/0de97b56824db0aab742fbe5a69fe44eb0edee8c#0de97b56824db0aab742fbe5a69fe44eb0edee8c"
-  integrity sha512-1mP7hEnzKBll/3r70vCh8v/v+Yby/G6rx5TFBIbVB4Wkx+H23wQi+pF0LeQk8oBL/Z+3PApfXjiCQ/YSxlZBAQ==
+"@psychedelic/plug-controller@0.22.5":
+  version "0.22.5"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.5/b6f76b8ca612ae71ea7820621dd428b03e5afcc4#b6f76b8ca612ae71ea7820621dd428b03e5afcc4"
+  integrity sha512-eCrG2vDAyup0Q7PZwuuvbxqu6EeXa+Kmr+6mPItr9ubQCLJyitNQf6gTQBCtT+x9yQqu8yqWmpeI2/J1bsMCJw==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 3ce795fc1f015c8e16bb42f516233f01815ce049 Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Thu, 6 Oct 2022 14:28:15 +0200
Subject: [PATCH 090/132] feat: new secret added

---
 tests/e2e/settings-contacts.test.js | 4 ++--
 tests/setup/jestSetup.js            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/settings-contacts.test.js b/tests/e2e/settings-contacts.test.js
index 0338e01e..09e36c9e 100644
--- a/tests/e2e/settings-contacts.test.js
+++ b/tests/e2e/settings-contacts.test.js
@@ -88,13 +88,13 @@ describe('Contacts', () => {
   const errorText = 'Incorrect ID format.';
 
   const correctData = [
-    { handle: secrets.subPrincipalId, name: 'Subaccount PrincipalID' },
+    { handle: secrets.sub4PrincipalId, name: 'Subaccount PrincipalID' },
     { handle: secrets.subAccountId, name: 'Subaccount AccountID' },
     { handle: secrets.icnsName, name: 'Subaccount ICNS' },
   ];
 
   const wrongData = [
-    { handle: secrets.subPrincipalId, errorMessage: 'This contact already exists under "Subaccount PrincipalID".' },
+    { handle: secrets.sub4PrincipalId, errorMessage: 'This contact already exists under "Subaccount PrincipalID".' },
     { handle: secrets.wrongId, errorMessage: errorText },
     { handle: secrets.wrongAccountId, errorMessage: errorText },
     { handle: secrets.wrongICNSName, errorMessage: errorText },
diff --git a/tests/setup/jestSetup.js b/tests/setup/jestSetup.js
index 81d5e962..ece314b5 100644
--- a/tests/setup/jestSetup.js
+++ b/tests/setup/jestSetup.js
@@ -11,6 +11,7 @@ global.secrets = {
   mainPrincipalId: process.env.MAIN_PRINCIPAL_ID,
   subAccountId: process.env.SUB_ACCOUNT_ID,
   subPrincipalId: process.env.SUB_PRINCIPAL_ID,
+  sub4PrincipalId: process.env.SUB4_PRINCIPAL_ID,
   icnsName: process.env.ICNS_NAME,
   password: process.env.PASSWORD,
   dustCanisterId: process.env.DUST_CANISTER_ID,

From 16fc07c0da9cc4f7a52375df18b180c0b363f0d7 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Thu, 6 Oct 2022 08:59:45 -0600
Subject: [PATCH 091/132] Removed provider update on useEffect

---
 source/components/Profile/index.jsx         | 2 +-
 source/views/Extension/Views/Home/index.jsx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index d1f39505..93423cbe 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -22,7 +22,7 @@ import {
 import { getRandomEmoji } from '@shared/constants/emojis';
 import { getTabURL } from '@shared/utils/chrome-tabs';
 import { getWalletsConnectedToUrl, getApp } from '@modules/storageManager';
-import { setEditAccount, toggleAccountHidden, useHiddenAccounts } from '@redux/profile';
+import { setEditAccount } from '@redux/profile';
 import { setICNSData } from '@redux/icns';
 import { useICPPrice } from '@redux/icp';
 import { getContacts } from '@redux/contacts';
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 17aad961..7aa12940 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -80,9 +80,12 @@ const Home = () => {
     extension.tabs.query({ active: true, lastFocusedWindow: true }, (browserTabs) => {
       const currentTab = browserTabs?.[0];
       const url = getTabURL(currentTab);
+      console.log('state.wallets', state.wallets);
       const ids = Object.values(state.wallets).map((account) => account.walletId);
+      console.log('ids', ids);
       setTab(currentTab);
       getWalletsConnectedToUrl(url, ids, (_connectedWallets = []) => {
+        console.log('connectedWallets', _connectedWallets, currentWalletId);
         setConnectedWallets(_connectedWallets);
         if (_connectedWallets.length > 0) {
           getApp(walletId, url, (currentApp) => {
@@ -131,7 +134,6 @@ const Home = () => {
     getUseICNS(walletId, (useICNS) => {
       dispatch(setUseICNS(useICNS));
     });
-    updateProviderConnection();
   }, [walletId]);
 
   useEffect(() => {

From a794eb6af20a68cb60e0e8d3b24262511356c02a Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Thu, 6 Oct 2022 09:01:26 -0600
Subject: [PATCH 092/132] Removede console.logs

---
 source/redux/contacts.js                    | 2 +-
 source/views/Extension/Views/Home/index.jsx | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/source/redux/contacts.js b/source/redux/contacts.js
index 27118136..986f22f0 100644
--- a/source/redux/contacts.js
+++ b/source/redux/contacts.js
@@ -133,7 +133,7 @@ export const contactSlice = createSlice({
         state.contacts = filteredContacts;
         state.groupedContacts = groupContacts(filteredContacts);
       })
-      .addCase(removeContact.fulfilled, (state, action) => {
+      .addCase(removeContact.fulfilled, (state) => {
         state.pendingDelete = false;
       })
       .addCase(removeContact.rejected, (state, action) => {
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 7aa12940..7ec0ae2d 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -80,12 +80,9 @@ const Home = () => {
     extension.tabs.query({ active: true, lastFocusedWindow: true }, (browserTabs) => {
       const currentTab = browserTabs?.[0];
       const url = getTabURL(currentTab);
-      console.log('state.wallets', state.wallets);
       const ids = Object.values(state.wallets).map((account) => account.walletId);
-      console.log('ids', ids);
       setTab(currentTab);
       getWalletsConnectedToUrl(url, ids, (_connectedWallets = []) => {
-        console.log('connectedWallets', _connectedWallets, currentWalletId);
         setConnectedWallets(_connectedWallets);
         if (_connectedWallets.length > 0) {
           getApp(walletId, url, (currentApp) => {

From b3860e3daf625336d0b23e72b46b5a9ad7adcd39 Mon Sep 17 00:00:00 2001
From: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 6 Oct 2022 15:58:18 -0500
Subject: [PATCH 093/132] Fix/update provider & toasts (#631)

* Updated provider package

* Stop showing toast for provider errors

* Disconnect only based on principalId

* Removed update providerConnection

* Made onConfirm method optional

* Removed update provider connection from home
---
 package.json                                    |  2 +-
 source/Modules/Controller/connection.js         | 11 +++++++++--
 .../components/ConnectAccountsModal/index.jsx   | 17 +++--------------
 source/views/Extension/Views/Home/index.jsx     | 11 -----------
 source/views/Extension/index.jsx                | 12 +-----------
 yarn.lock                                       |  8 ++++----
 6 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 70befff0..b9432d19 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
     "@psychedelic/plug-controller": "0.22.5",
-    "@psychedelic/plug-inpage-provider": "^2.3.0",
+    "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
     "axios": "^0.21.1",
diff --git a/source/Modules/Controller/connection.js b/source/Modules/Controller/connection.js
index 9e58a5a5..d108d393 100644
--- a/source/Modules/Controller/connection.js
+++ b/source/Modules/Controller/connection.js
@@ -99,8 +99,15 @@ export class ConnectionModule extends ControllerModuleBase {
   #disconnect() {
     return {
       methodName: 'disconnect',
-      handler: async (opts, url) => {
-        removeApp(this.keyring?.currentWalletId?.toString(), url, (removed) => {
+      handler: async (opts, url, principal) => {
+        const state = await this.keyring.getState();
+
+        const walletIdFromPrincipal = Object.values(state.wallets).find((wallet) => (
+          wallet.principal === principal
+        ))?.walletId;
+        const walletIdToRemove = walletIdFromPrincipal ?? this.keyring.currentWalletId;
+
+        removeApp(walletIdToRemove, url, (removed) => {
           if (!removed) {
             opts.callback(ERRORS.CONNECTION_ERROR, null);
           }
diff --git a/source/components/ConnectAccountsModal/index.jsx b/source/components/ConnectAccountsModal/index.jsx
index c2bdba91..dd4d7664 100644
--- a/source/components/ConnectAccountsModal/index.jsx
+++ b/source/components/ConnectAccountsModal/index.jsx
@@ -59,21 +59,9 @@ const ConnectAccountsModal = ({
     });
   };
 
-  const updateProviderConnection = async (walletId) => {
-    const currentWallet = wallets.find(w => w.walletId === walletId) || null;
-    if (currentWallet) {
-      extension.tabs.query({ active: true }, (activeTabs) => {
-        extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
-      });
-    }
-  };
-
   const handleConfirm = () => {
     Object.keys(walletsToUpdate).forEach((walletId) => {
-      if (walletsToUpdate[walletId]) {
-        connectAccountToTab(walletId, tab)
-        updateProviderConnection(walletId);
-      }
+      walletsToUpdate[walletId] && connectAccountToTab(walletId, tab);
     });
     onConfirm?.();
     setWalletsToUpdate({});
@@ -130,12 +118,13 @@ ConnectAccountsModal.propTypes = {
   tab: PropTypes.arrayOf(PropTypes.objectOf(PropTypes.string)).isRequired,
   open: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
-  onConfirm: PropTypes.func.isRequired,
+  onConfirm: PropTypes.func,
   connectedWallets: PropTypes.arrayOf(PropTypes.number),
 };
 
 ConnectAccountsModal.defaultProps = {
   connectedWallets: [],
+  onConfirm: () => {},
 };
 
 export default ConnectAccountsModal;
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index 7ec0ae2d..c752e9fb 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -97,16 +97,6 @@ const Home = () => {
     });
   };
 
-  const updateProviderConnection = async () => {
-    const currentWallet = wallets.find(w => w.walletId === walletId) || null;
-
-    if (currentWallet) {
-      extension.tabs.query({ active: true }, (activeTabs) => {
-        extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
-      });
-    }
-  };
-
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
       const migratedWalletId = state.walletIds ? true : false;
@@ -156,7 +146,6 @@ const Home = () => {
         wallets={wallets}
         open={isConnectAccountsOpen}
         onClose={() => setConnectAccountsOpen(false)}
-        onConfirm={updateProviderConnection}
         connectedWallets={connectedWallets}
         app={app}
         tab={tab}
diff --git a/source/views/Extension/index.jsx b/source/views/Extension/index.jsx
index 49d6adcb..2f4475b2 100644
--- a/source/views/Extension/index.jsx
+++ b/source/views/Extension/index.jsx
@@ -1,6 +1,5 @@
 import React, { StrictMode, useEffect, useState } from 'react';
-import extension from 'extensionizer';
-import { ToastContainer, toast } from 'react-toastify';
+import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import ReactDOM from 'react-dom';
 import i18n from 'i18next';
@@ -19,15 +18,6 @@ i18n.use(initReactI18next).init(initConfig);
 const App = () => {
   const [initialRoute, setInitialRoute] = useState(null);
 
-  useEffect(() => {
-    extension.runtime.onMessage.addListener((request, sender, sendResponse) => {
-      if (request.errorMessage) {
-        toast(request.errorMessage, { type: 'error' });
-        sendResponse(true);
-      }
-    });
-  }, []);
-
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_LOCKS, params: {} }, (locks) => {
       if (locks?.isInitialized) {
diff --git a/yarn.lock b/yarn.lock
index ebb95e51..a43b672d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1820,10 +1820,10 @@
     tweetnacl "^1.0.3"
     uuidv4 "^6.2.13"
 
-"@psychedelic/plug-inpage-provider@^2.3.0":
-  version "2.3.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-inpage-provider/2.3.0/5e5510ab742506cbc20f0e74688e13142ec15b73#5e5510ab742506cbc20f0e74688e13142ec15b73"
-  integrity sha512-JBIR9k7+Jxj2xQ4cHDUkz1WmIe4VVk3kmyt7RaaePAQDUwHUhz0gISV5jpTBNKWqziF70ANDM66BjCkTrFSQEA==
+"@psychedelic/plug-inpage-provider@^2.3.1":
+  version "2.3.1"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-inpage-provider/2.3.1/1949663fd9e863c1127e36602c56f41a4c0408c4#1949663fd9e863c1127e36602c56f41a4c0408c4"
+  integrity sha512-1e3pd2rgNQ0da6Knxtcgdgeehyv1bS1zqgU7XphYKmy4SuXbR5bIoCCqvmcNgJGMWyeqaQBcfEzNVKRF1pfm9Q==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 1df42835365428588366035d24cd8c1acba1f912 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Thu, 6 Oct 2022 16:31:06 -0600
Subject: [PATCH 094/132] Updated contollero to version 0.22.6

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

diff --git a/package.json b/package.json
index b9432d19..e7ef0620 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.22.5",
+    "@psychedelic/plug-controller": "0.22.6",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index a43b672d..35ed9bad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.22.5":
-  version "0.22.5"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.5/b6f76b8ca612ae71ea7820621dd428b03e5afcc4#b6f76b8ca612ae71ea7820621dd428b03e5afcc4"
-  integrity sha512-eCrG2vDAyup0Q7PZwuuvbxqu6EeXa+Kmr+6mPItr9ubQCLJyitNQf6gTQBCtT+x9yQqu8yqWmpeI2/J1bsMCJw==
+"@psychedelic/plug-controller@0.22.6":
+  version "0.22.6"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.22.6/8c25286d67f09de822ac3ba5d2871c673b5262a4#8c25286d67f09de822ac3ba5d2871c673b5262a4"
+  integrity sha512-5XoiF34l9k7jh1uwLwNIidjG7EhIAEh4yvQ6TrSR/1X//NdFO+ipkooUj3GSEqbGZAF4nhOOJfwO7PX9EE8agQ==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 83cb485099307a1629518bafe93ab53c8308f609 Mon Sep 17 00:00:00 2001
From: tomiir <rocchitomas@gmail.com>
Date: Mon, 10 Oct 2022 11:21:47 -0600
Subject: [PATCH 095/132] Updated extension icons to rainbow background ones
 (#595)

Co-authored-by: rocky-fleek <tomas@fleek.co>
---
 source/assets/icons/favicon-16.png | Bin 491 -> 974 bytes
 source/assets/icons/favicon-32.png | Bin 1745 -> 2770 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/source/assets/icons/favicon-16.png b/source/assets/icons/favicon-16.png
index fcf94fc5bd0f90ec4b0cb9d4a0b6275e5784f226..b0756213ae0fd67a4cd838c7e8ccae2ad3d1c1de 100644
GIT binary patch
delta 902
zcmV;119|-G1I`DKReu9xNkl<ZcmXX_U1(fY5dP+#bANX8w@b37q#IWfB`qyltTk<u
zidOKif=Gy95UN2GpNbTVKH1WjRup{bLw&JT`%o;1XhEYPKg8Br!K|y1pd_YEX_GX~
zcK^C}?>+a7XJgNB=3&m9k8i%2A(*r6laa&m5C_~aYH=zxihnDhDYCgSWQqq7oI3%$
zT7(uY(WoSQAs0Nwrw6_ocw6**Hu^Dv4uLtw)hfO6NGFaD@5SWw6+~4H;n%1$?ctpd
z2T;0E#GQo_Jf&l<Lhq~HgOF8${Tc*lLKOK3YSlU^DAr&wX{`|WYCR^jW+!Br&v!2$
zkiJa`lLqs~l7Avn(Cf(|hoo7vtrT&D|4*pM2^4#Z3=5F0byE5cvoc8#*C?^`Pt0!k
z7iX}D)!rFcWsvfLTTKlZ!4Ft`^eR-VPx0?t;H*f742hCof2X5-i8{I_(DZN;`O0>v
zyn>VkG_(e2k6l5lzlgZ8WFl#N1G>LRqUUU*0f<Nn@_z}sjO$C!!MeT+dVB<xci#dr
zBXQ&qmW9OH@iFL970;Y`9Gjl+K_F~s7i0;BB`qIP)Hsu`;pq7yww(ABnXWFd<G?+2
z4vBM9i0Um&rSSKc^QagLWEobh!sJy9Qv*PjPea)X-dHZ9t$z^vJ{ZE}g$wxgn@ObN
z?Re-|FMqae-HMk_eT00thR`<R#7yUi>HsxZc7Sr@Dn$Dj`kXnOJ#r8Yb{k$>>Nm=J
z`0>OPa;e{OdGG~fihp2tI01NOddM;Wvc~Kv8qdt&Xy4CB-%jEFY!8|piMePLyto-%
zA`PqoJ4)@ioNq;X_FEv%MmuTBr@+wBSaurm3x5}}v-=uy6Iq<UxEp)+^rO%*i(D>;
zq1$`$>|ZsA=r^PS-_&oJ$&(Np_CI!53I*Y6zO>MQCpXU1Q+-v$-4$HCGy@7|G0?UN
zFWIj{TQ_lUc#>1XCn7f5X{HCq-_H{TEg}ku%SGH%xQaLL%i_fcmhO%pffu%5`tyBQ
z?SC9aQ`~~BV+`ejL#H4%4)5{==_iC#EL|qwwJ|o=jP1=g(a}_^ZwU&#hJXBdBwE1I
zvdrF5J#3slDQ=wpX)-<Bn;=q~g;1{TFj*8LzY^f-%&m2R>~tKSbRl5XdsnxDso>a-
cgH!MQ2Z+#wFMzS4*8l(j07*qoM6N<$f~FI+H2?qr

delta 416
zcmV;R0bl;k2kQfnReu41Nkl<Zcmbu7KS%;$7{;GF%``OngNb&;H6?BmQIkVZK~vOZ
zOV%1<Lu-4h4UJ(C4MAXIv^CihQeskrhe!rO7fSgjyRW-XJUu-{@PU_m_;~Mk&-dO7
zv?&-2ic0l+ZbYZXpfBBX76WQv0Mjr#B#@RLe4p<L=S*Z)F@Nd|UO#=jSm98rjiM$E
z!^l=(F&1DQ%EM)S!MHiw3g8<?1!Rg|%_kH{v1+H4`}R<PXY!6hTcrYyq6Vx!GvLJf
zt&%Q+<TOEeO+t2pKrC~3$ZccZaSfX(kB%8sHxmS1bmse`pn?VTYKzWGTn(Kt8UT5k
zNyDDusn5FQnty{7+W>i6P!sw0YZT%bNePcremcbFZ?tD3YAh}VcIgJjgI%y&$Mnqe
z&LDJKZ~rK{)!rt+jIf+1-X7nud;xa-l={7U16C4D{6~^|+h;(di}Jdb5t3~HtvgY&
z;rB2m5D5_zs$nMT{n7<!U^!@p$~g6Vd#$q2#rH2cg&C++ubzMF27{mIf-sc;0000<
KMNUMnLSTZm*u7c+

diff --git a/source/assets/icons/favicon-32.png b/source/assets/icons/favicon-32.png
index 08b079d4dfef891e8c3fe789af9bd5f7c205863b..7137f28c4185b7ee43caf30e82b6a47424e9de35 100644
GIT binary patch
delta 2713
zcmV;K3TE}u4bl~mReuU+Nkl<ZcmY*cX^fTC8Gg<=-*UHEa0Zwe7#Xw@ElyQzL_}e5
zsakM>V&w;EEhwgGC>XWIq)F?NwstYN)|jeMel$jnSkqb&3u$RnQ&40aTyUAe5oQ>{
zJ9oeLTTY*IzF`>e&As2f=R4<ppZ9s!PhjG8?lUj9I<?GZCw~@8ojC4uVrVCbgcHVa
zBJ%;fSisjxyRjCo`OlBb`);J+gb`$*wa4E+_qkfwJ+9`5S94y)@jgG6TUNic>e&-|
zMWTFXj}C&JN~6arj<ldsEgJz;y&+T(S|vUlq@<^PDB*_Cz7ZU1s0R0NuLuI}iwQs>
zZT4!1fF&r?fPc`6z|C(JV-S$bR&HB4XaSu0^p4LQ9rq|IA#$SCv?kP|ToIyN!qY#w
z24{4(S;Y4~^)Gxnl!qTFYpolELev^sS4-mT-cGE$?JB!(>`)#r+`Szsg7K_Of{nR9
z78VGN9jq6N=gHHa+kR6dbx$aTj-)^&fsnAmI22(N=zm(Zh@9t~U<_?7K4Pt*1$j2#
zIz|*VM7>ef%8e)Y`DvaBLr85D8>QBASmov#>7M3P^Cl;ha+4Mm7}Fhs+e7Z=MS*Kk
zT||wl`86q+9<l)FJ#7G(n{gD0FsO?#3?}#4BPMpZLn5|HE&X(bqb(SrqNvXa9dVA1
zPDp3uD1TuO8xT}Q8FaRuB9}<xWQ$Rsd~*#kVa1Walox{zl1w>-;F{Q?Qb&`433t#9
z1VFpBny^Kfm(@!aL_##;33Da@2*Uz_X);A2RBX7=I*RZ$q<l%EgnJz@5GmcnmQ`#3
z7#6f<rYUPUWoZLtLU^PV=@$s?|EXdFDh#4fGk^OKl6n~h&_RO&m=19~l`3XMNU4D^
zrl{C}kP|@|3kkbOP|`4{t=~zZR*jlawFV@EO4RERaUiBL5Jh!es~4!4HU!kky`oV@
z6x7Z6uK}pn%SbUyLwF+1Tp;~q!>~-ClJ1gZuleOSY>eq3f~wXaOC`)&@HX1d`po*<
zSbx>sHf>UFsai+1!hGl3GvD-|7diZ;(45VoCD&r_Ieb?~DpbpT!bAJNvzYr>6MToB
zr*eWIMRbo8kpV!K0z_dAVWoi1MFW#IH-hOnP&k9MH!(qS45~UjcMNHF962|SoGLMW
zT-xQL$Wt}Gy#yNE4i`x%14q9HbU#j5(ti<-i7!P43;=RT?euiqpo1%5L7}1yMvh;N
zV}&KChtnra9|JzzYY@X<bQN4xfh#LWxyR7zA3<Ai0M-46EHB-C-6sRrUXtVpRh5yK
zqVK7j3}`apNFCU_LWEkz0pg${-u?7preDUQH#g%C-a~cMI>cimW+R*#?Pz`M0e?jE
zXLFyA(*AMmy=4a)qvQ0gK(5orl`mX@j@}Nl-Bt`ED3Xj5W4=js<9|9?Dl#BhmJ|X;
zCTqHJ1(hebx#jRM!aFt~F6Dtt8c3%Qju%i|w;8p8qo@wmFuL}B)C&~O`#P0E@tDTn
zzxz7Mg%TPFC^<0SYzXWZPJ<00pnpzgh-w&j*!&d{V}ZY!4M{3B*J7;MQ^xUKyRh{*
z>6da!f=dJeMgQUfG)m))lgKhN^?rlrKmPM4_~xx=O)d+E_0?ro8d=5*q=o>(36AIr
zf{57(?$}Ylt-H$vq4D77!<aj#hnAcOOM&siIIg?;YJ4;>0Fh1O8<$;%zkj^;n!P)x
zyBqoOaavzMP;6N1ZS^wv3;-o9kcnDqN_A+wOwb{f2g11I&K;#h6|HJ@n{dyjyRiC(
z)pqUSC!e%AzH0djZ2Zwij28=d@ZS4y>a5x5Tf7)cF1pC>d-25=@vE`FS{F<fCRaha
zlC@YG^_DV+ieYQHrJtR`q<`fEC+5)V>EFSRpZgsaoWB5B=J}1+U5^rL#fA;H;Ah@V
zsC5Es)~vxJk35Q8E{D<4qbRe5Z~4<x$lt#i!^Ht~Hw`5H#i3$mECayyKO4}t4jAQh
zg$+h05(P$UGoxFyeSwzjIKH26!}|5>asBlxk;`VW<JIlBxv?CVw11wRWN2wQHgDL7
z%dfrC-hb(hH!!$r4dV8B_~fe@XwSY6r`mwy(R#)J`(V;|OtYE$`X6l#*R>j=d;#Ie
zF+5-C!s2-c8SzZ38q=|n!{IN1e;ho{P;qfx*ZIhObvoi>vsmwa3*vAvhCP)7DC#oa
zyWtu<b=gd+i0I=wPJe5A4Hu5?#EOSf$hw{>MoITGvw~y{2u6Nv8nnxGPvEWYH*xXl
zM}az(6M(2^5tapdyIq{qF@x)@2h$2rGY%pC@B+K9%bkvETb5#|au~hahw;MV87QO_
z8aj=`g>R#C|8_XOf^GLOZPYM87YIW=xiAw$>=98`>Sqp37k{@ee8*aElp6)F><rM{
zdmDBg{Q{z#M}G7m=CpnZG4l{~eKzuL87*hDGb<E^9^Z!zyXWEemp9p3QmoHG_kg37
z7Yd~e@sS-<%!ff}o3W5=Zj#o+m!j;X^jif-TsV`K1}V$Jx!(dVU4Jvyu3d{2D^_69
z@>9{<+iNprXn$x3{r&yey?ZydZrzIiEqor+{!<}<oK4${KiGvCwGx!)n@Y*K&lFh;
zKo}PYPGTg3f#`8SparP9;*Nh_fWNJL9nGmSgkM45<u2~KJ%!&q@iMk;+lG^cUQD?H
zcg|ghIhihqYK-|uB8=p|#H#(z!%aoZzHl<Vb!-4AsDJ4{SoTXZHW?<&?3Pr<2!#s7
z*to<MJx7wH<QTK$q6q198vP%hf=njEw9MLTI-NmBdk#OJw;mh2emGhA-aggE!cQO8
z=M+C-(~=<l!c3`V=;GB5K*j}Jpc~Aj$2gEo6Pe=>75aGP@adSnw}hWAIC!Em;I>-|
zxbd0__J8y<Ge&(Biyr39(pWZMA+x;;x*thdW{9uc`&+~<Z^29X!c<(l8pXm!BFFV)
z9-u>va+8$8#Digmj*@%~31xsMKAw*~qb>OLlJ_txSG6FzIs#nVkw01cjj+%`G<QD%
zEJfKJ#oq2m5uEZdnmk{)EO5%0ZiC;%pteS{B!3FkdDA6*?9Dx#3ruDbsTP(MvY||1
zGBuA>Qh4^A4h$btIJ2ES!k;>*n$~Ju6f)YYc>nV%-aTy#<SC<Q$~f9%sdJP_TC1?_
zT?m;34MDu4X0BV(L*Mrq#e)67#sP;n#cF8)I0Rtoh5>b8#K)N}1%jwdgq*<Cd2u|>
zqkq3}5KT=QS?0XUBv(=-jnX<kX_=+~+G-%;yD3*aL?nYSt{^F9VB|AW0wTrPAwxke
z9Isk9XtjFSJJy=Wn#_Weui?*qDhIL|O~1$5_2T3qz&!H_J^*kAFb|Vl<0KM(w(zbu
zpOyQT-ILe4zKnPVts9bwH7OSClFH>dpMT?Y&b6Oc56#qX4o;h*HZgDb3kRbko|#w3
z8eJz%zey%vn9NG9{LdmFqajYwmzvXd%GkGT%i!Bf|1g&)*3qhc%2LFPFjp>G7qCc4
zmR2Y2h>yO?OaYMe^-@v6_h}#>f26WToKR{@eZoS#lmG8=WAD60cmH?Loc=#~84^eV
Tdm52n00000NkvXXu0mjfl|3A8

delta 1680
zcmV;B25<S&710flReuI%Nkl<Zcmc&%du&rx82_Ey=UUozFCcVC>vXge!s27-Obp71
zMq`*pqeSG9C=a6!k*Guo<0Tjo2SyVOI$jbmQ^7#^2M~<F7zpFx=pHcKR#wKkt!vkI
z_jdPq&K)fS+cKhNzmt>m`tJFD=R4my-?;?0z-F^qw0gq=$bWPy2(bawf`1E&YD#fP
zQqlF7U9QUmhseOjSf_IVmC4foL}?-rx~$ISDvdT((Mql(uaq%e&8m9*uOO2$vNDOc
zz5P&(K)-UjG|?xMCqIF?b6!VL(PYMvqOq|tuH19a6=T-S8H!ws+l}`2_JkzTGBbP~
zUT>w^;c(dGB!9{|oKB}QIR~Hkz=4Bt<q8T4Vsgi;s^D_D63$7eu$1}RCZUg#5)1(d
zfkms;mk5NJ149KuiUsEJ`4}RwqiGW`gy7pSqy#wBi3YR|Ed+D_J>|7}ah9cMJ*7a;
zZZLr*qLf@pU?)0c4WfZ1J|bF0j3^kc)C2Aw_}%`vdVfgnSSP);(@>OxtS>VA1(==K
z(O1qthd>0jcNAKpg@z}pfex(B+BXs(xn86FwY@X<p|z@Ya260uf}+^h<3u2QAG(8M
z(JKvSeKORl9;k&L7<5fAXgXkFWty&y(Gz1AJ10naopZik4zn6D=q>1#vT&jKL-<3^
zSf8|eCx0TlwuAV)pm{hSk&>ARS*%PZ2W_Dyh?{r7v;7=QHWM7Ljz!*#`?!-`w=+c_
z<iQi*iu;xKFG1e^9U`BvKt!uiT(_@c59HsD!(34gDbR)1+3OH$>i|`$5jYb<+leal
z1^O^<{&+<9S7sFAS{q4V4pY2%DhTzD+Yr%d5r18htX4zvb|O+*2J!3N2zh->c`UA>
zPpd`EIu|6CB1B@FBQgSaU;%T8V%~l~<{s&Rud5Xm-ZrJ*lA5ZNT|OVijUNZv+@x4(
zd|@FDA3ds!^D%`)2=KXmNX<@Vs%b(3aV_w4O&ISo0;Z4*vw9e&6&FLg+J<Yj^;o-n
zIe(TcT7+MB?M6<z4Wm+r<EPDA@Yb9;s3_m0$npH*)MEJcBbC)l%nEnp0~}HRF{z9Q
zp7i3_u}awOc04)h38jD4%9VIi^#VH7L9AM}3h%wMQ0e!0uHq64*9UaWcY2FqqFdNx
zqGE$PBA}4SY62P7iRHNyu;SCzNW0g8yMM-v!KovanASN3kEA#iqULh~mdt%0_dhvN
zc?0b6w4-zW0;t)^{LA+M?zS97&>f7gBi==1H5sx0?QuZ52M8Nux&A5>4X0qFIul0!
zXrS2%S=1{e0+ii?QVR?!0~Wn80hM+g>+ge3(}}_{t5G-QG(@-f4+5%;%&gK|JAeJ6
zgy&zn2y;5~BwYwZAHv}}H_mw}a~dx~v>PL>63FmokcbvtooaOUcB8iA61+w~rqodE
ze0&7Bi$!Dur21BfTTdV!;u7F6X9O_u;cE&3Xj#^X*iwBD9)E2ye53MkR+oV)l?G?6
zA=Kx2kv=^KcTb;yA8PlYs3iwAj(;pPr*R)=_W5Qn)Qt^s2_*D^EkB#^{4?#aj_3iq
zfnYbMfPB9L4?VOEh3wd6XOCvts>rsqv|z*f4LJYjdAySSEXL%I!ki;P9I;!Vx_Slr
zgZmPx;XaVpndli_kl%x?WlgcR&!@($g(g(~q3ypT$$(cq>zHUBk8d5zm4Bn_OA(N}
z$cXfk*-*845)$BB@G>h$#v62dv`Q{|G@w{gucvr<Y8W{-6^w=yq*+)t8}QhJ8hkt>
z3njguK}U_sjVXl#D6cPv_WWriK{d(E&0ETXMQJiAZizLEJ#0G$dT})Lv3-_Uj1W^G
zm9GIV6v8dGp`>LkT;a>frhf&MQKmADww_T%<atQ)L&B}F|92C*0|K%~L|``YONHLx
zq3%;0wY$-djVCVRqbpzGigXRPgCx*tsxFTwoR*o{%jS71nXo^gLRGa9CZ@a~KX`rp
zM0r_8vGHUhzC3yvB9(AEuz!)#OSP`uN-Suoy-+4oQi?&Ks+ygKSbvbEH~n2!RT~B~
zg`&Kn&b5r!V==VDd+l&q27mQnQnHWvc9@6B$j=M)Q{Yb@_R;2wbnN^k4aq^eSWNh!
zp|19mXwOa2u%WJInLwzW%5oWNRwtU~Lc<MrA?&roE#hj>CsfMk;;R;WgZBE`+VulR
a{{}cEkJLZRLIeN+00{s|MNUMnLSTYS11<{y


From 9d8665213c2179941effca6cca0b72e855394526 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Tue, 11 Oct 2022 16:05:49 -0300
Subject: [PATCH 096/132] gh comments done

---
 source/views/Extension/Views/ImportWallet/Steps/Step2.jsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 44da9811..146bafd4 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -37,14 +37,14 @@ const Step2 = ({ userPemFile }) => {
   };
 
   const createImportedAccount = (pemContent) => {
-    console.log(pemContent);
+    setLoading(true);
     sendMessage(
       {
         type: HANDLER_TYPES.IMPORT_PEM_ACCOUNT,
         params: { icon: currentEmoji, name: walletName, pem: pemContent },
       },
       (wallet) => {
-        console.log(wallet);
+        console.log(wallet)
       }
     );
     setLoading(false);
@@ -53,7 +53,6 @@ const Step2 = ({ userPemFile }) => {
 
   const readPemCreateAccount = () => {
     setLoading(true);
-    setDisabled(true);
     let fileReader = new FileReader();
     fileReader.readAsText(userPemFile);
     fileReader.onloadend = () => {
@@ -115,7 +114,7 @@ const Step2 = ({ userPemFile }) => {
           <Button
             variant="rainbow"
             value={t("common.save")}
-            onClick={() => readPemCreateAccount()}
+            onClick={readPemCreateAccount()}
             loading={loading}
             disabled={!disabled}
             fullWidth

From ef75341a5a3c9feca6ac2b410eb808e9e8620111 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Wed, 12 Oct 2022 10:36:24 -0600
Subject: [PATCH 097/132] Fixed controller version;

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

diff --git a/package.json b/package.json
index 79e6159c..5613f2c9 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.23.3",
+    "@psychedelic/plug-controller": "0.23.2",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",

From 1b4373eeb27547f3fa46a22d60c71dbcecfd9adc Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Wed, 12 Oct 2022 11:02:09 -0600
Subject: [PATCH 098/132] Removed duplicated imports

---
 package.json                                      | 2 +-
 source/views/Extension/Views/NFTDetails/index.jsx | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5613f2c9..cd575371 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plug",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Your plug into the Internet Computer",
   "private": true,
   "repository": "https://github.com/Psychedelic/plug",
diff --git a/source/views/Extension/Views/NFTDetails/index.jsx b/source/views/Extension/Views/NFTDetails/index.jsx
index 18379a4d..c7fa139f 100644
--- a/source/views/Extension/Views/NFTDetails/index.jsx
+++ b/source/views/Extension/Views/NFTDetails/index.jsx
@@ -5,8 +5,6 @@ import {
   Layout,
   Header, Button, Badge, LinkButton, NFTDisplayer, ICNSDisplay,
 } from '@components';
-import { HttpAgent } from '@dfinity/agent';
-import { getNFTActor } from '@psychedelic/dab-js';
 import { useTranslation } from 'react-i18next';
 import { getNFTActor } from '@psychedelic/dab-js';
 import { Typography } from '@material-ui/core';

From 5aae33aa103d84977559fd79ef2ad14d98301007 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Wed, 12 Oct 2022 11:22:53 -0600
Subject: [PATCH 099/132] Fixed ICNS issue by importing correct collections
 from nft reducer

---
 .../Extension/Views/NFTDetails/index.jsx      | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/source/views/Extension/Views/NFTDetails/index.jsx b/source/views/Extension/Views/NFTDetails/index.jsx
index c7fa139f..535f21d6 100644
--- a/source/views/Extension/Views/NFTDetails/index.jsx
+++ b/source/views/Extension/Views/NFTDetails/index.jsx
@@ -1,24 +1,23 @@
 import React, { useEffect, useMemo, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { HttpAgent } from '@dfinity/agent';
 import {
   Layout,
   Header, Button, Badge, LinkButton, NFTDisplayer, ICNSDisplay,
 } from '@components';
-import { useTranslation } from 'react-i18next';
+import { HttpAgent } from '@dfinity/agent';
 import { getNFTActor } from '@psychedelic/dab-js';
-import { Typography } from '@material-ui/core';
-import { ArrowUpRight } from 'react-feather';
-import extension from 'extensionizer';
-
+import { useTranslation } from 'react-i18next';
 import BackIcon from '@assets/icons/back.svg';
 import ExpandIcon from '@assets/icons/expand.svg';
+import { useDispatch, useSelector } from 'react-redux';
 import { TABS, useRouter } from '@components/Router';
 import CollectionImg from '@assets/icons/nfts/collection.png';
 import DescriptionImg from '@assets/icons/nfts/description.png';
 import AttributesImg from '@assets/icons/nfts/attributes.png';
 import AboutImg from '@assets/icons/nfts/about.png';
+import { Typography } from '@material-ui/core';
 import { setSelectedNft } from '@redux/nfts';
+import { ArrowUpRight } from 'react-feather';
+import extension from 'extensionizer';
 import { NFT_COLLECTION_DEFAULT_TYPES } from '@shared/constants/nft';
 
 import Section from './components/section';
@@ -33,8 +32,7 @@ const getTokenDetails = async ({ index, canister, standard }) => {
 
 const NFTDetails = () => {
   const { t } = useTranslation();
-  const { selectedNft: nft } = useSelector((state) => state.nfts);
-  const { collections } = useSelector((state) => state.wallet);
+  const { selectedNft: nft, collections } = useSelector((state) => state.nfts);
   const { navigator: routerNavigator } = useRouter();
   const [populatedNFT, setPopulatedNFT] = useState(nft);
   const classes = useStyles();
@@ -49,19 +47,19 @@ const NFTDetails = () => {
     routerNavigator.navigate('home', TABS.NFTS);
   };
 
-  const collection = useMemo(() => collections?.find((col) => col.canisterId === populatedNFT?.canister),
-    [collections, populatedNFT]);
+  const collection = useMemo(() => collections?.find((col) => col.canisterId === nft?.canister),
+    [collections, nft]);
 
-  const name = `${populatedNFT?.name ?? `#${populatedNFT?.index}`}`;
+  const name = `${nft?.name ?? `#${nft?.index}`}`;
   const isICNS = collection?.name === 'ICNS';
 
-  const openNFT = (url) => {
+  const openNFT = (url) => () => {
     const parsedUrl = isICNS
       ? `https://icns.id/domains/${populatedNFT?.name.replace('.icp', '')}/detail`
       : url;
 
     extension.tabs.create({
-      url: parsedUrl,
+      url: parsedUrl?.replace('type=thumbnail', ''),
     });
   };
 
@@ -74,7 +72,6 @@ const NFTDetails = () => {
 
   useEffect(() => {
     window.scrollTo(0, 0);
-    console.log(nft);
     getTokenDetails(nft).then((details) => setPopulatedNFT({ ...nft, ...details }));
   }, []);
 
@@ -87,7 +84,7 @@ const NFTDetails = () => {
           <img
             className={classes.expandIcon}
             src={ExpandIcon}
-            onClick={() => openNFT(nft?.url?.replace('type=thumbnail', ''))}
+            onClick={openNFT(populatedNFT?.url)}
             data-testid="expand-nft"
           />
         )}

From 9e1358dadfb9d3eb01163e9abc6a07fa70e1e6c1 Mon Sep 17 00:00:00 2001
From: Cancu <52618089+Cancuuu@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:06:36 -0300
Subject: [PATCH 100/132] Feature/delete account (#633)

* delete button in wallets

* moved dialog to Profile, modified some desing in AccountItem

* delete modal

* changed prop name

* problems solved

* added dialog, states and keyring

* hide modal and pass the string

* gh comments done

* flipped setopen
---
 source/Background/Keyring/index.js            |  3 +
 .../Profile/components/AccountItem/index.jsx  | 82 +++++++++++--------
 .../Profile/components/AccountItem/styles.js  |  9 +-
 source/components/Profile/index.jsx           | 37 +++++++++
 source/components/Profile/styles.js           |  6 ++
 .../Views/ImportWallet/Steps/Step2.jsx        |  2 +-
 6 files changed, 102 insertions(+), 37 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 634a54c7..82a80cc8 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -91,6 +91,7 @@ export const HANDLER_TYPES = {
   ADD_CUSTOM_TOKEN: 'add-custom-token',
   ADD_CUSTOM_NFT: 'add-custom-nft',
   IMPORT_PEM_ACCOUNT: 'import-pem-account',
+  REMOVE_PEM_ACCOUNT: 'remove-pem-account',
   CREATE_PRINCIPAL: 'create-principal',
   SET_CURRENT_PRINCIPAL: 'set-current-principal',
   GET_PEM_FILE: 'get-pem-file',
@@ -128,6 +129,7 @@ export const getKeyringErrorMessage = (type) => ({
   [HANDLER_TYPES.ADD_CUSTOM_TOKEN]: 'adding custom token.',
   [HANDLER_TYPES.ADD_CUSTOM_NFT]: 'adding custom nft.',
   [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: 'importing account from pem',
+  [HANDLER_TYPES.REMOVE_PEM_ACCOUNT]: 'remove pem account',
   [HANDLER_TYPES.CREATE_PRINCIPAL]: 'creating your principal.',
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]: 'setting your principal.',
   [HANDLER_TYPES.GET_PEM_FILE]: 'getting your PEM file.',
@@ -186,6 +188,7 @@ export const getKeyringHandler = (type, keyring) => ({
   },
   [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: async (params) => keyring.importAccountFromPem(params),
   [HANDLER_TYPES.CREATE_PRINCIPAL]: async (params) => keyring.createPrincipal(params),
+  [HANDLER_TYPES.REMOVE_PEM_ACCOUNT]: async (params) => keyring.deleteImportedAccount(params),
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]:
     async (walletId) => {
       await keyring.setCurrentPrincipal(walletId);
diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index c2f00b8d..b6a9e4f9 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import clsx from 'clsx';
 import { IconButton } from '@material-ui/core';
 import { useDispatch } from 'react-redux';
@@ -7,6 +7,7 @@ import { useHiddenAccounts, toggleAccountHidden } from '@redux/profile';
 import BluePencil from '@assets/icons/blue-pencil.svg';
 import InvisibleIcon from '@assets/icons/invisible.svg';
 import VisibleIcon from '@assets/icons/visible.svg';
+import RemoveCircleOutline from '@material-ui/icons/RemoveCircleOutline';
 
 import UserIcon from '../../../UserIcon';
 import useStyles from './styles';
@@ -17,6 +18,8 @@ const AccountItem = ({
   isEditing,
   handleChangeAccount,
   handleEditAccount,
+  handleRemoveAccountModal,
+  handleRemoveAccount,
 }) => {
   const classes = useStyles();
   const hiddenAccounts = useHiddenAccounts();
@@ -33,44 +36,59 @@ const AccountItem = ({
   if (isHidden && !isEditing) return null;
 
   return (
-    <div
-      className={clsx(classes.accountItemContainer, isHidden && classes.hiddenAccount)}
-      onClick={(e) => handleChangeAccount(e, account.walletId)}
-    >
-      <div className={classes.leftContainer}>
-        <UserIcon
-          size="small"
-          icon={account.icon ? account.icon : '👽'}
-          style={{ marginLeft: -6, marginRight: 12 }}
-        />
+    <>
+      <div
+        className={clsx(
+          classes.accountItemContainer,
+          isHidden && classes.hiddenAccount,
+        )}
+      >
         <div
-          className={classes.accountDetails}
-        >
-          <span className={classes.accountName} data-testid={`account-name-${account.name}`}>
-            {account.icnsData.reverseResolvedName ? account.icnsData.reverseResolvedName : account.name }
-          </span>
-        </div>
-      </div>
-      <div className={classes.rightContainer}>
-        <IconButton
-          data-testid={`edit-button-${account.name}`}
-          disabled={isHidden}
-          onClick={(e) => handleEditAccount(e, account)}
+          onClick={(e) => handleChangeAccount(e, account.walletId)}
+          className={classes.leftContainer}
         >
-          <img
-            className={clsx(isHidden && classes.disabledIcon)}
-            src={BluePencil}
+          <UserIcon
+            size="small"
+            icon={account?.icon ?? '👽'}
+            style={{ marginLeft: -6, marginRight: 12 }}
           />
-        </IconButton>
-        { isEditing && (
+          <div className={classes.accountDetails}>
+            <span
+              className={classes.accountName}
+              data-testid={`account-name-${account.name}`}
+            >
+              {account?.icnsData?.reverseResolvedName ?? account?.name}
+            </span>
+          </div>
+        </div>
+        <div className={classes.rightContainer}>
           <IconButton
-            onClick={(e) => { toggleAccountVisibility(e, account.walletId) }}
+            data-testid={`edit-button-${account.name}`}
+            disabled={isHidden}
+            onClick={(e) => handleEditAccount(e, account)}
           >
-            <img src={isHidden ? InvisibleIcon : VisibleIcon} />
+            <img
+              className={clsx(isHidden && classes.disabledIcon)}
+              src={BluePencil}
+            />
           </IconButton>
-        )}
+          {!(account.type === 'MNEMONIC') && (
+            <IconButton onClick={(e) => handleRemoveAccountModal(e, account)}>
+              <RemoveCircleOutline style={{ color: '#DC2626' }} />
+            </IconButton>
+          )}
+          {isEditing && (
+            <IconButton
+              onClick={(e) => {
+                toggleAccountVisibility(e, account.walletId);
+              }}
+            >
+              <img src={isHidden ? InvisibleIcon : VisibleIcon} />
+            </IconButton>
+          )}
+        </div>
       </div>
-    </div>
+    </>
   );
 };
 
diff --git a/source/components/Profile/components/AccountItem/styles.js b/source/components/Profile/components/AccountItem/styles.js
index 11e12e71..56b7ac87 100644
--- a/source/components/Profile/components/AccountItem/styles.js
+++ b/source/components/Profile/components/AccountItem/styles.js
@@ -1,15 +1,14 @@
 import { makeStyles } from '@material-ui/core/styles';
-import SMOOTH_TRANSITION from '@shared/styles/transitions'; 
+import SMOOTH_TRANSITION from '@shared/styles/transitions';
 
 export default makeStyles(() => ({
   accountItemContainer: {
     width: '100%',
     height: '52px',
-    padding: '8px 21px 8px 27px',
+    padding: '8px 10px 8px 27px',
     display: 'flex',
     flexDirection: 'row',
     alignItems: 'center',
-    justifyContent: 'space-between',
     cursor: 'pointer',
     color: '#000000',
     transition: `${SMOOTH_TRANSITION}`,
@@ -31,6 +30,7 @@ export default makeStyles(() => ({
     flexDirection: 'row',
     justifyContent: 'flex-start',
     alignItems: 'center',
+    flex: 2,
   },
   accountDetails: {
     display: 'flex',
@@ -50,10 +50,11 @@ export default makeStyles(() => ({
   },
   rightContainer: {
     display: 'flex',
-    flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'center',
     opacity: '0',
+    flex: 0.5,
+    marginLeft: 10,
 
     transition: `${SMOOTH_TRANSITION}`,
     '& > button': {
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index 1e50a5b9..857d31bf 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -29,6 +29,7 @@ import { setICNSData } from '@redux/icns';
 import { useICPPrice } from '@redux/icp';
 import { getContacts } from '@redux/contacts';
 import { useMenuItems } from '@hooks';
+import { Dialog, Button as CButton } from '@components';
 import ConnectAccountsModal from '../ConnectAccountsModal';
 import HoverAnimation from '../HoverAnimation';
 import MenuItem from '../MenuItem';
@@ -62,6 +63,8 @@ const Profile = ({ disableProfile }) => {
   const [accountName, setAccountName] = useState('');
   const [error, setError] = useState(null);
   const [connectedWallets, setConnectedWallets] = useState([]);
+  const [selectedRemoveAccount, setSelectedRemovedAccount] = useState(null);
+  const [openRemoveModal, setOpenRemoveModal] = useState(false);
 
   const handleToggle = () => {
     setOpen((prevOpen) => !prevOpen);
@@ -187,8 +190,41 @@ const Profile = ({ disableProfile }) => {
     navigator.navigate('import-wallet');
   };
 
+  const handleRemoveAccountModal = (e, account) => {
+    e.stopPropagation();
+    setOpenRemoveModal(true);
+    setSelectedRemovedAccount(account);
+  };
+
+  const handleRemoveAccount = () => {
+    sendMessage({
+      type: HANDLER_TYPES.REMOVE_PEM_ACCOUNT,
+      params: selectedRemoveAccount.walletId,
+    });
+    setOpenRemoveModal(false);
+    setOpen(false);
+    navigator.navigate('home');
+  };
+
   return (
     <>
+      <Dialog
+        title="Remove Account"
+        onClose={() => setOpenRemoveModal(false)}
+        open={openRemoveModal}
+        component={(
+          <div className={classes.removeAccountDialog}>
+            <Typography>
+              Are you sure you want to remove Testing from your account list?
+              Are you sure you want to remove <b>{selectedRemoveAccount?.name}</b> from your account list?
+            </Typography>
+            <Typography>
+              You can always add the wallet back by importing it again.
+            </Typography>
+            <CButton variant="danger" value="Remove Account" onClick={handleRemoveAccount} style={{ marginTop: 22 }} />
+          </div>
+        )}
+      />
       <HoverAnimation
         disabled={disableProfile}
         style={{ padding: '15px' }}
@@ -280,6 +316,7 @@ const Profile = ({ disableProfile }) => {
                         isCurrentAccount={isCurrentAccount}
                         handleChangeAccount={handleChangeAccount}
                         handleEditAccount={handleEditAccount}
+                        handleRemoveAccountModal={handleRemoveAccountModal}
                       />
                     );
                   })
diff --git a/source/components/Profile/styles.js b/source/components/Profile/styles.js
index 8e441ff0..985a6d39 100644
--- a/source/components/Profile/styles.js
+++ b/source/components/Profile/styles.js
@@ -28,6 +28,12 @@ export default makeStyles((theme) => ({
     minWidth: 37,
     minHeight: 37,
   },
+  removeAccountDialog: {
+    padding: '0px 20px 10px 20px',
+    display: 'flex',
+    flexDirection: 'column',
+    gap: 5,
+  },
   label: {
     width: 'auto',
   },
diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 146bafd4..0248d5f7 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -114,7 +114,7 @@ const Step2 = ({ userPemFile }) => {
           <Button
             variant="rainbow"
             value={t("common.save")}
-            onClick={readPemCreateAccount()}
+            onClick={readPemCreateAccount}
             loading={loading}
             disabled={!disabled}
             fullWidth

From a31bd1ad726ebad81b88bf19bed7fb01daf60686 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Thu, 13 Oct 2022 18:50:03 -0300
Subject: [PATCH 101/132] added check url and qm logo

---
 source/assets/icons/question-hat.svg  | 28 +++++++++++++++++++++++++++
 source/components/AssetItem/index.jsx |  8 ++++----
 source/components/TokenIcon/index.js  | 25 +++++++++++++++++++++---
 source/components/Tokens/index.jsx    |  2 ++
 4 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 source/assets/icons/question-hat.svg

diff --git a/source/assets/icons/question-hat.svg b/source/assets/icons/question-hat.svg
new file mode 100644
index 00000000..531dd54c
--- /dev/null
+++ b/source/assets/icons/question-hat.svg
@@ -0,0 +1,28 @@
+<svg width="73" height="73" viewBox="0 0 73 73" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_ddd_10910_10888)">
+<rect x="16" y="14" width="41" height="41" rx="20.5" fill="black"/>
+</g>
+<path d="M34.3401 42.3997V42.118C34.3466 41.1514 34.4463 40.3809 34.6393 39.8065C34.8388 39.232 35.1283 38.7681 35.5079 38.4146C35.8875 38.0611 36.3443 37.7407 36.8784 37.4535C37.2773 37.2326 37.6344 37.0034 37.9496 36.7659C38.2649 36.5284 38.5158 36.266 38.7024 35.9788C38.889 35.686 38.9823 35.3602 38.9823 35.0011C38.9823 34.62 38.8761 34.2859 38.6638 33.9987C38.4515 33.7115 38.1652 33.4905 37.8049 33.3359C37.451 33.1812 37.0585 33.1039 36.6274 33.1039C36.2092 33.1039 35.8135 33.184 35.4404 33.3441C35.0672 33.4988 34.7616 33.7308 34.5235 34.0401C34.2855 34.3439 34.1568 34.7222 34.1375 35.1751H30.1998C30.232 34.0705 30.5408 33.1591 31.1263 32.4411L42.3602 32.3997C42.9199 33.0846 43.1998 33.9103 43.1998 34.8769C43.1998 35.5231 43.0744 36.0975 42.8234 36.6002C42.5789 37.0973 42.2347 37.5391 41.7908 37.9258C41.3468 38.3069 40.8224 38.6521 40.2176 38.9614C39.7094 39.221 39.2911 39.4916 38.963 39.7733C38.6413 40.055 38.4 40.3809 38.2392 40.7509C38.0848 41.121 38.0043 41.5767 37.9979 42.118V42.3997H34.3401Z" fill="white" fill-opacity="0.8"/>
+<path d="M34.7748 46.8139C35.1692 47.2044 35.6442 47.3997 36.1998 47.3997C36.5553 47.3997 36.8831 47.3104 37.1831 47.1319C37.4831 46.9478 37.7247 46.7051 37.9081 46.4038C38.0969 46.097 38.1942 45.7595 38.1997 45.3913C38.1942 44.8446 37.9914 44.3759 37.5914 43.9854C37.1914 43.5949 36.7275 43.3997 36.1998 43.3997C35.6442 43.3997 35.1692 43.5949 34.7748 43.9854C34.3859 44.3759 34.1943 44.8446 34.1998 45.3913C34.1943 45.9436 34.3859 46.4178 34.7748 46.8139Z" fill="white" fill-opacity="0.8"/>
+<path d="M36.7045 28.9065C33.6769 28.9065 30.7249 29.5794 28 31H45.3333C42.6084 29.5794 39.7322 28.9065 36.7045 28.9065ZM40.6405 23L35.4934 23.8224L32.9956 23L31.3304 28.0093H42.3057L40.6405 23Z" fill="white" fill-opacity="0.8"/>
+<defs>
+<filter id="filter0_ddd_10910_10888" x="0" y="0" width="73" height="73" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="8"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.1294 0 0 0 0 0.1686 0 0 0 0 0.2118 0 0 0 0.08 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_10910_10888"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.2511 0 0 0 0 0.2606 0 0 0 0 0.27 0 0 0 0.12 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_10910_10888" result="effect2_dropShadow_10910_10888"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.0242 0 0 0 0 0.1728 0 0 0 0 0.3198 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="effect2_dropShadow_10910_10888" result="effect3_dropShadow_10910_10888"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect3_dropShadow_10910_10888" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/source/components/AssetItem/index.jsx b/source/components/AssetItem/index.jsx
index 22ce92a4..2f8306c9 100644
--- a/source/components/AssetItem/index.jsx
+++ b/source/components/AssetItem/index.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import NumberFormat from 'react-number-format';
 import PropTypes from 'prop-types';
 import Typography from '@material-ui/core/Typography';
@@ -32,7 +32,7 @@ const AssetItem = ({
   const classes = useStyles();
   const { t } = useTranslation();
   const { currentNetwork, usingMainnet } = useSelector((state) => state.network);
-  const [ shouldRemove, setShouldRemove] = useState(false);
+  const [shouldRemove, setShouldRemove] = useState(false);
   const [isHovering, setIsHovering] = useState(false);
   const [openDelete, setOpenDelete] = useState(false);
 
@@ -61,7 +61,7 @@ const AssetItem = ({
   const handleRemoveAssetDisplay = () => {
     setShouldRemove(true);
     handleModalClose();
-  }
+  };
 
   const ledgerNotSpecified = !usingMainnet && !currentNetwork?.ledgerCanisterId;
 
@@ -136,7 +136,7 @@ const AssetItem = ({
             ? <Skeleton className={classes.valueSkeleton} />
             : (<NumberFormat value={value} displayType="text" decimalScale={2} fixedDecimalScale thousandSeparator="," prefix="$" />)}
         </Typography>
-      )}
+        )}
       { !failed && !loading && (
         <div
           className={clsx(classes.deleteToken, !value && classes.deleteTokenMoveRight, isHovering && classes.deleteTokenActive)}
diff --git a/source/components/TokenIcon/index.js b/source/components/TokenIcon/index.js
index 6a20ddf1..49db1d64 100644
--- a/source/components/TokenIcon/index.js
+++ b/source/components/TokenIcon/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core';
 import randomColor from 'random-color';
@@ -6,6 +6,7 @@ import clsx from 'clsx';
 
 import { NFT_COLLECTION_DEFAULT_TYPES } from '@shared/constants/nft';
 import SHADOW_1 from '@shared/styles/shadows';
+import QuestionHat from '@assets/icons/question-hat.svg';
 import NFTDisplayer from '../NFTDisplayer';
 
 const useStyles = makeStyles((theme) => ({
@@ -33,6 +34,14 @@ const useStyles = makeStyles((theme) => ({
   },
 }));
 
+const isUrl = (urlString) => {
+  try {
+    return Boolean(new URL(urlString));
+  } catch (e) {
+    return false;
+  }
+};
+
 const TokenIcon = ({
   logo,
   symbol,
@@ -44,14 +53,24 @@ const TokenIcon = ({
 }) => {
   const classes = useStyles();
   const backgroundColor = `rgb(${color.values.rgb.join(',')})`;
-
+  const [finalLogo, setFinalLogo] = useState(null);
   const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[nft.canisterId];
 
+  if (isUrl(logo)) {
+    fetch(logo).then(() => {
+      setFinalLogo(logo);
+    }).then(() => {
+      setFinalLogo(QuestionHat);
+    });
+  } else {
+    setFinalLogo(logo);
+  }
+
   if (logo) {
     return nft ? (
       <NFTDisplayer url={logo} className={className} defaultTag={nftDefaultTag} {...props} />
     ) : (
-      <img src={logo} className={clsx(classes.icon, className)} {...props} />
+      <img src={finalLogo} className={clsx(classes.icon, className)} {...props} />
     );
   }
 
diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index 7cd2bb01..a3f3c72a 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -23,6 +23,8 @@ const Tokens = () => {
   const { onScroll, fullScroll } = useScroll();
   const [displayCustomToken, setDisplayCustomToken] = useState(false);
 
+  console.log('assets del state ->', assets);
+
   const fetchAssets = (cb = () => {}, refresh) => {
     sendMessage({
       type: HANDLER_TYPES.GET_ASSETS,

From 59dac16477ed1195a1e9769af1dcdcc549377455 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Fri, 14 Oct 2022 16:00:30 -0300
Subject: [PATCH 102/132] added use effect and checking the status code

---
 source/components/TokenIcon/index.js | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/source/components/TokenIcon/index.js b/source/components/TokenIcon/index.js
index 49db1d64..5c7420da 100644
--- a/source/components/TokenIcon/index.js
+++ b/source/components/TokenIcon/index.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core';
 import randomColor from 'random-color';
@@ -53,24 +53,28 @@ const TokenIcon = ({
 }) => {
   const classes = useStyles();
   const backgroundColor = `rgb(${color.values.rgb.join(',')})`;
-  const [finalLogo, setFinalLogo] = useState(null);
+  const [resolvedLogo, setResolvedLogo] = useState(null);
   const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[nft.canisterId];
 
-  if (isUrl(logo)) {
-    fetch(logo).then(() => {
-      setFinalLogo(logo);
-    }).then(() => {
-      setFinalLogo(QuestionHat);
-    });
-  } else {
-    setFinalLogo(logo);
-  }
+  useEffect(() => {
+    if (isUrl(logo)) {
+      fetch(logo).then((res) => {
+        if (res.status !== 404) {
+          setResolvedLogo(logo);
+        } else {
+          setResolvedLogo(QuestionHat);
+        }
+      });
+    } else {
+      setResolvedLogo(logo);
+    }
+  }, [logo]);
 
   if (logo) {
     return nft ? (
       <NFTDisplayer url={logo} className={className} defaultTag={nftDefaultTag} {...props} />
     ) : (
-      <img src={finalLogo} className={clsx(classes.icon, className)} {...props} />
+      <img src={resolvedLogo} className={clsx(classes.icon, className)} {...props} />
     );
   }
 

From 2b0cf21bc3a2c1fe4b708f3161ef911491a0dac3 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Sat, 15 Oct 2022 21:51:04 -0300
Subject: [PATCH 103/132] tested done!

---
 source/components/TokenIcon/index.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/components/TokenIcon/index.js b/source/components/TokenIcon/index.js
index 5c7420da..21f00321 100644
--- a/source/components/TokenIcon/index.js
+++ b/source/components/TokenIcon/index.js
@@ -35,6 +35,7 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 const isUrl = (urlString) => {
+  console.log(urlString);
   try {
     return Boolean(new URL(urlString));
   } catch (e) {
@@ -59,10 +60,12 @@ const TokenIcon = ({
   useEffect(() => {
     if (isUrl(logo)) {
       fetch(logo).then((res) => {
-        if (res.status !== 404) {
-          setResolvedLogo(logo);
-        } else {
+        console.log('el res status es -->', res.status);
+        if (res.status === 404) {
           setResolvedLogo(QuestionHat);
+        } else {
+          console.log('es un 200');
+          setResolvedLogo(logo);
         }
       });
     } else {

From 0a8cec3f7896747629a3d5a7f7d0b1ce356e58a0 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Sat, 15 Oct 2022 22:14:26 -0300
Subject: [PATCH 104/132] removed console logs

---
 source/components/TokenIcon/index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/components/TokenIcon/index.js b/source/components/TokenIcon/index.js
index 21f00321..34c1fbb3 100644
--- a/source/components/TokenIcon/index.js
+++ b/source/components/TokenIcon/index.js
@@ -35,7 +35,6 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 const isUrl = (urlString) => {
-  console.log(urlString);
   try {
     return Boolean(new URL(urlString));
   } catch (e) {
@@ -60,11 +59,9 @@ const TokenIcon = ({
   useEffect(() => {
     if (isUrl(logo)) {
       fetch(logo).then((res) => {
-        console.log('el res status es -->', res.status);
         if (res.status === 404) {
           setResolvedLogo(QuestionHat);
         } else {
-          console.log('es un 200');
           setResolvedLogo(logo);
         }
       });

From 351072faf98c0e3482ae9d0fec3fbe9981cac293 Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Sat, 15 Oct 2022 22:30:58 -0300
Subject: [PATCH 105/132] removed another console.log

---
 source/components/Tokens/index.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/components/Tokens/index.jsx b/source/components/Tokens/index.jsx
index a3f3c72a..7cd2bb01 100644
--- a/source/components/Tokens/index.jsx
+++ b/source/components/Tokens/index.jsx
@@ -23,8 +23,6 @@ const Tokens = () => {
   const { onScroll, fullScroll } = useScroll();
   const [displayCustomToken, setDisplayCustomToken] = useState(false);
 
-  console.log('assets del state ->', assets);
-
   const fetchAssets = (cb = () => {}, refresh) => {
     sendMessage({
       type: HANDLER_TYPES.GET_ASSETS,

From c01ebaf391d792bb00facb6a577426eae1677524 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Mon, 17 Oct 2022 10:03:32 -0600
Subject: [PATCH 106/132] Removed console.logs

---
 source/views/Extension/Views/ImportWallet/Steps/Step2.jsx     | 4 +---
 .../Extension/Views/SendNFT/components/NFTDisplay/index.jsx   | 1 -
 .../Extension/Views/SendNFT/components/ReviewStep/index.jsx   | 1 -
 source/views/Extension/Views/WalletDetails/index.jsx          | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 0248d5f7..4691dcb6 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -43,9 +43,7 @@ const Step2 = ({ userPemFile }) => {
         type: HANDLER_TYPES.IMPORT_PEM_ACCOUNT,
         params: { icon: currentEmoji, name: walletName, pem: pemContent },
       },
-      (wallet) => {
-        console.log(wallet)
-      }
+      () => {},
     );
     setLoading(false);
     navigator.navigate("home");
diff --git a/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx b/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx
index b5703d8d..ade21d2f 100644
--- a/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/NFTDisplay/index.jsx
@@ -10,7 +10,6 @@ const NFTDisplay = ({ nft }) => {
   const classes = useStyles();
 
   const nftDefaultTag = NFT_COLLECTION_DEFAULT_TYPES[nft?.canisterId];
-  console.log('nft to display', nft);
   return (
     <Card className={classes.nftDisplayContainer}>
       <NFTDisplayer url={nft?.url} className={classes.nftImage} defaultTag={nftDefaultTag} />
diff --git a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
index 7d9eb049..4dbd6c63 100644
--- a/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
+++ b/source/views/Extension/Views/SendNFT/components/ReviewStep/index.jsx
@@ -56,7 +56,6 @@ const ReviewStep = () => {
     ? [sendAddress, resolvedSendAddress]
     : [sendAddress];
 
-  console.log('collection', collections, collection);
   return (
     <div className={classes.reviewStepContainer}>
       <NFTDisplay nft={{ ...nft, collection: collection?.name }} />
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index d50ff9e8..e3c049c2 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -248,7 +248,6 @@ const WalletDetails = () => {
   const executeAccountSwitch = (wallet) => {
     sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: accountSwitchId },
       (state) => {
-        console.log('state on account switch from details', state);
         if (Object.values(state?.wallets).length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));

From 013dda76a3887257bbab2a2bb3e18d5e83fbfaa6 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Mon, 17 Oct 2022 11:21:39 -0600
Subject: [PATCH 107/132] Fixed issue where subaccount names wouldnt appear on
 profile sidebar. Removed logs

---
 .../Profile/components/AccountItem/index.jsx  | 24 +++++++++++++++----
 source/components/Profile/index.jsx           |  4 +---
 .../Extension/Views/AddNFT/Steps/Step2.jsx    | 15 ++++--------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index b6a9e4f9..aed36e44 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { IconButton } from '@material-ui/core';
 import { useDispatch } from 'react-redux';
@@ -14,12 +15,10 @@ import useStyles from './styles';
 
 const AccountItem = ({
   account,
-  isCurrentAccount,
   isEditing,
   handleChangeAccount,
   handleEditAccount,
   handleRemoveAccountModal,
-  handleRemoveAccount,
 }) => {
   const classes = useStyles();
   const hiddenAccounts = useHiddenAccounts();
@@ -57,7 +56,7 @@ const AccountItem = ({
               className={classes.accountName}
               data-testid={`account-name-${account.name}`}
             >
-              {account?.icnsData?.reverseResolvedName ?? account?.name}
+              {account?.icnsData?.reverseResolvedName || account?.name}
             </span>
           </div>
         </div>
@@ -92,4 +91,21 @@ const AccountItem = ({
   );
 };
 
+AccountItem.propTypes = {
+  account: PropTypes.shape({
+    name: PropTypes.string,
+    walletId: PropTypes.string,
+    icon: PropTypes.string,
+    type: PropTypes.string,
+    icnsData: PropTypes.shape({
+      reverseResolvedName: PropTypes.string,
+      names: PropTypes.arrayOf(PropTypes.string),
+    }),
+  }).isRequired,
+  isEditing: PropTypes.bool.isRequired,
+  handleChangeAccount: PropTypes.func.isRequired,
+  handleRemoveAccountModal: PropTypes.func.isRequired,
+  handleEditAccount: PropTypes.func.isRequired,
+};
+
 export default AccountItem;
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index 4c74df70..ebed5808 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -18,7 +18,6 @@ import {
   setAccountInfo,
   setAssets,
   setAssetsLoading,
-  setCollections,
   setTransactions,
 } from '@redux/wallet';
 import { getRandomEmoji } from '@shared/constants/emojis';
@@ -49,7 +48,7 @@ const Profile = ({ disableProfile }) => {
   const { navigator } = disableProfile ? {} : useRouter();
   const [isEditing, setIsEditing] = useState(false);
 
-  const { walletId, principalId } = useSelector((state) => state.wallet);
+  const { walletId } = useSelector((state) => state.wallet);
   const icpPrice = useICPPrice();
 
   const [open, setOpen] = useState(false);
@@ -119,7 +118,6 @@ const Profile = ({ disableProfile }) => {
   const executeAccountSwitch = (wallet) => {
     sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: wallet },
       (state) => {
-        console.log('state on account switch from profile', state);
         const walletsArray = Object.values(state?.wallets);
         if (walletsArray.length) {
           const newWallet = state.wallets[state.currentWalletId];
diff --git a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
index b4fd8d06..b1f89f94 100644
--- a/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
+++ b/source/views/Extension/Views/AddNFT/Steps/Step2.jsx
@@ -1,19 +1,12 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Typography } from '@material-ui/core';
 import Grid from '@material-ui/core/Grid';
-import {
-  Button, Container, USDFormat, AssetFormat,
-  TokenIcon,
-} from '@components';
 
-import { HANDLER_TYPES, sendMessage } from '@background/Keyring';
-import {
-  setCollections,
-  setCollectionsLoading,
-} from '@redux/wallet';
-import { useDispatch, useSelector } from 'react-redux';
+import { Button, Container, TokenIcon } from '@components';
+import { registerNFT } from '@redux/nfts';
 
 import useStyles from '../styles';
 
@@ -53,7 +46,7 @@ const Step2 = ({ selectedToken, handleClose }) => {
             value={t('common.add')}
             onClick={registerToken}
             loading={collectionsLoading}
-            disabled={loading}
+            disabled={collectionsLoading}
             fullWidth
             data-testid="add-button"
           />

From c048ea550a96114555eee096504862ed39542f6d Mon Sep 17 00:00:00 2001
From: Alina Sytnik <alinasytnik1999@gmail.com>
Date: Tue, 18 Oct 2022 16:35:36 +0200
Subject: [PATCH 108/132] fix: medium link

---
 tests/e2e/edit-account.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/e2e/edit-account.test.js b/tests/e2e/edit-account.test.js
index d5d3dbf7..99622f8c 100644
--- a/tests/e2e/edit-account.test.js
+++ b/tests/e2e/edit-account.test.js
@@ -89,7 +89,7 @@ const learnMoreButtonClick = async (browser, page) => {
 
   const newPage = await newPagePromise;
   const url = await newPage.evaluate(() => document.location.href);
-  expect(url).toBe('https://medium.com/plugwallet/internet-computer-ids-101-669b192a2ace');
+  expect(url).toBe('https://medium.com/@plug_wallet/669b192a2ace');
 };
 
 const waitForWalletName = async (page, walletName, timeout = 1000) => {

From 91633e1788ff22ffd9a14428d93bbf3621b2114c Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 18 Oct 2022 11:40:40 -0600
Subject: [PATCH 109/132] Added refresh param to requests coming from the
 header

---
 .../ConnectionStatus/components/ConnectionControls/index.jsx   | 2 +-
 source/redux/nfts.js                                           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index 8faa38c4..cea97f4a 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -93,7 +93,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   };
 
   const loadCollections = () => {
-    dispatch(getNFTs());
+    dispatch(getNFTs({ refresh: true }));
   };
 
   const refreshWallet = () => {
diff --git a/source/redux/nfts.js b/source/redux/nfts.js
index d0b036c6..69ae20b7 100644
--- a/source/redux/nfts.js
+++ b/source/redux/nfts.js
@@ -3,8 +3,9 @@ import { asyncSendMessage, HANDLER_TYPES } from '@background/Keyring';
 
 export const getNFTs = createAsyncThunk(
   'nfts/getNFTs',
-  async () => asyncSendMessage({
+  async ({ refresh } = { refresh: false }) => asyncSendMessage({
     type: HANDLER_TYPES.GET_NFTS,
+    params: { refresh },
   }),
 );
 

From 5a1bba5f84e5bc4b9b60ab10edbb8ec31e13b810 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 18 Oct 2022 13:38:00 -0600
Subject: [PATCH 110/132] Added refresh only if on nft tab

---
 .../ConnectionStatus/components/ConnectionControls/index.jsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
index cea97f4a..cbca0a58 100644
--- a/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
+++ b/source/components/ConnectionStatus/components/ConnectionControls/index.jsx
@@ -28,7 +28,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   const classes = useStyles();
   const icpPrice = useICPPrice();
   const dispatch = useDispatch();
-  const { tabIndex } = disableNavigation ? {} : useRouter();
+  const { tabIndex, route } = disableNavigation ? {} : useRouter();
   const {
     walletId,
     assetsLoading,
@@ -93,7 +93,7 @@ const ConnectionControls = ({ disableNavigation, hidden }) => {
   };
 
   const loadCollections = () => {
-    dispatch(getNFTs({ refresh: true }));
+    dispatch(getNFTs({ refresh: route === 'home' && tabIndex === TABS.NFTS }));
   };
 
   const refreshWallet = () => {

From 58be6f8e1b3726bf54625f0aea879fa2fec091c8 Mon Sep 17 00:00:00 2001
From: tomiir <rocchitomas@gmail.com>
Date: Tue, 18 Oct 2022 14:16:58 -0600
Subject: [PATCH 111/132] Chore/update with dev (#636)

* Release/0.6.0 (#563)

* Chore/update 0.6.0 (#567)

* Fixed transactionId and object proptypes

* Auto fix with --fix

* Fixed remaining issues

* Updated controller to 0.19.8 and bumped plug version to 0.5.4

* Moved whitelist population to requestConnect

* Removed whitelist population

* Updated branch

Co-authored-by: rocky-fleek <tomas@fleek.co>
Co-authored-by: tomiir <rocchitomas@gmail.com>

* add tokens and add nft buttons

* add nft form done - form component abstraction not done - add nft not working yet

* feat: tests initialization

* added get-nft-info method

* added few changes

* now the buttons looks like the design

* removed standards to DIP721v2 only - display token info in step2

* feat: test ids added/first test added and passed

* added add-custom-nft function

* feat: all tests added and passed

* fix: variables changes

* feat: extra case added

* feat: tests for settings-network added and done

* added get nfts after add custom in step2

* Fix: Redundant optimistic update (#587)

* Added controller with optimistic update fix. Removed filterCollectionTokens method as it was redundant

* Reconciliated yarn lock

* Renamed hook to blockNFTFetch and removed unnecessary formatting

* Restored lockfile

* Reinstalled controller'

Co-authored-by: rocky-fleek <tomas@fleek.co>

* feat: send custom tokens on sonic network tests added and passed

* fix: hardcode fixes

* feat: case with checking that tabs are blocked added

* show collections with 0 nfts without chevron - if the icon is null show a default image

* change package.json and yarn.lock to upstream content

* few console logs removed, text and state names

* yarn lock updated to release yarn lock

* now can download pem file with your account id

* Remove custom token (#589)

* Updated controller version

* Added removeToken to Keyring

* Added remove to AssetItem

* Prepopulated protectedAsset

* Added translation for remove token modal

* Renamed Remove to remove custom token

* Feat/account switch refactor (#566)

* Added swit account icon

* Added AccountItem component

* Added edit account field

* Added account switch to WalletDetails

* Removed replacing icns on set

* Made profile edit on click

* Added walletId param to icns methods

* Lint fixes for profile

* Added local ICNS data

* Lint fixes

* Added shared transition

* Conditionaly show switch account button

* disable edit name while using icns

* removed clgs and moved useEffect

* added close curly brace

* Update source/views/Extension/Views/AddNFT/hooks/useSteps.jsx

Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>

* Update source/views/Extension/Views/AddNFT/Steps/Step2.jsx

Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>

* it work calling sendMessage in AppConnection

* fixed length problem

* Migrated walletId to uuid

* removed console.log

* removed unused field on redux

* fixed address shortening for ICNS names

* Added border radius to custom tokens search

* reduced token decimal places

* Reduced font weight of text in banner

* Added border raduis to second step of addToken

* Updated yarn.lock

* Added utils for icns address

* modified getAssetFee function - removed fixed fee values - now can send max amount of any tokens

* added fallback if fee and decimal doenst exist

* Serialize host into metadata and pass it into regular connection requests

* Controller version bump

* Fixed switch account ICNS bug

* Added account icon constant

* replaced user icon with constant

* Fixed switch account & account default icon

* Updated dab-js and added fee as a parameter in the send operation

* Prevented default on Profile actions (#611)

* remove switch account icon (#613)

* automation fixes

* Installed controller and dabjs with icp standard fixes

* Fixed connect account modal (#618)

* Fix/Contacts (#616)

* WIP

* Code cleanup

* mend

* Fixed hiddenAccounts

* Fixed state accounts

* Fixed export identity

* Bumped controller version

* Added missing semicolon

* Plug controller bump

* Rollback controller to 0.22.3

* Fixed collection info and nft details issues

* Fixed popup & connect accounts info (#625)

* Abstracted internalRequestBalance and fixed issues with bigint parsing

* Removed subaccount validation

* Installed controller 0.22.5 with Principal serializatio on pid contacts

* feat: new secret added

* Removed provider update on useEffect

* Removede console.logs

* Fix/update provider & toasts (#631)

* Updated provider package

* Stop showing toast for provider errors

* Disconnect only based on principalId

* Removed update providerConnection

* Made onConfirm method optional

* Removed update provider connection from home

* Updated contollero to version 0.22.6

* Updated extension icons to rainbow background ones (#595)

Co-authored-by: rocky-fleek <tomas@fleek.co>

Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Co-authored-by: rocky-fleek <tomas@fleek.co>
Co-authored-by: tomiir <rocchitomas@gmail.com>
Co-authored-by: Alina Sytnik <alinasytnik1999@gmail.com>
Co-authored-by: Alina Sytnik <33018206+alinasytnik@users.noreply.github.com>

* Added dfinity mainnet urls to CORS permissions in manifest

* Added dfinity mainnet urls to CORS permissions in manifest (#634)

Co-authored-by: rocky-fleek <tomas@fleek.co>

* Update source/Background/Keyring/index.js

Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>

* Update source/manifest.json

Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>

Co-authored-by: Cancu <52618089+Cancuuu@users.noreply.github.com>
Co-authored-by: angarita-dev <44899916+angarita-dev@users.noreply.github.com>
Co-authored-by: rocky-fleek <tomas@fleek.co>
Co-authored-by: Alina Sytnik <alinasytnik1999@gmail.com>
Co-authored-by: Alina Sytnik <33018206+alinasytnik@users.noreply.github.com>
---
 source/Background/Keyring/index.js            |  8 +-
 .../components/ConnectAccountsModal/index.jsx | 13 +--
 .../Profile/components/AccountItem/index.jsx  | 94 +++++++++----------
 .../Profile/components/AccountItem/styles.js  |  7 +-
 source/components/Profile/index.jsx           |  1 -
 source/manifest.json                          |  6 +-
 source/views/Extension/Views/Home/index.jsx   |  1 -
 7 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 63c9fbd8..e58ca822 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -90,8 +90,6 @@ export const HANDLER_TYPES = {
   GET_NFT_INFO: 'get-nft-info',
   ADD_CUSTOM_TOKEN: 'add-custom-token',
   ADD_CUSTOM_NFT: 'add-custom-nft',
-  IMPORT_PEM_ACCOUNT: 'import-pem-account',
-  REMOVE_PEM_ACCOUNT: 'remove-pem-account',
   CREATE_PRINCIPAL: 'create-principal',
   SET_CURRENT_PRINCIPAL: 'set-current-principal',
   GET_PEM_FILE: 'get-pem-file',
@@ -109,6 +107,8 @@ export const HANDLER_TYPES = {
   REMOVE_NETWORK: 'remove-network',
   SET_CURRENT_NETWORK: 'set-current-network',
   GET_CURRENT_NETWORK: 'get-current-network',
+  IMPORT_PEM_ACCOUNT: 'import-pem-account',
+  REMOVE_PEM_ACCOUNT: 'remove-pem-account',
 };
 
 export const getKeyringErrorMessage = (type) => ({
@@ -128,8 +128,6 @@ export const getKeyringErrorMessage = (type) => ({
   [HANDLER_TYPES.GET_NFT_INFO]: 'fetching nft info.',
   [HANDLER_TYPES.ADD_CUSTOM_TOKEN]: 'adding custom token.',
   [HANDLER_TYPES.ADD_CUSTOM_NFT]: 'adding custom nft.',
-  [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: 'importing account from pem',
-  [HANDLER_TYPES.REMOVE_PEM_ACCOUNT]: 'remove pem account',
   [HANDLER_TYPES.CREATE_PRINCIPAL]: 'creating your principal.',
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]: 'setting your principal.',
   [HANDLER_TYPES.GET_PEM_FILE]: 'getting your PEM file.',
@@ -145,6 +143,8 @@ export const getKeyringErrorMessage = (type) => ({
   [HANDLER_TYPES.SET_CURRENT_NETWORK]: 'setting the current network',
   [HANDLER_TYPES.GET_CURRENT_NETWORK]: 'getting the current network',
   [HANDLER_TYPES.REMOVE_CUSTOM_TOKEN]: 'removing custom token',
+  [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: 'importing account from pem',
+  [HANDLER_TYPES.REMOVE_PEM_ACCOUNT]: 'removing pem account',
 }[type]);
 
 export const sendMessage = (args, callback) => {
diff --git a/source/components/ConnectAccountsModal/index.jsx b/source/components/ConnectAccountsModal/index.jsx
index f3804834..62c6fe1c 100644
--- a/source/components/ConnectAccountsModal/index.jsx
+++ b/source/components/ConnectAccountsModal/index.jsx
@@ -59,18 +59,11 @@ const ConnectAccountsModal = ({
     });
   };
 
-  const updateProviderConnection = async (walletId) => {
-    const currentWallet = wallets.find(w => w.walletId === walletId) || null;
-    if (currentWallet) {
-      extension.tabs.query({ active: true }, (activeTabs) => {
-        extension.tabs.sendMessage(activeTabs[0].id, { action: 'updateConnection' });
-      });
-    }
-  };
-
   const handleConfirm = () => {
     Object.keys(walletsToUpdate).forEach((walletId) => {
-      walletsToUpdate[walletId] && connectAccountToTab(walletId, tab);
+      if (walletsToUpdate[walletId]) {
+        connectAccountToTab(walletId, tab);
+      }
     });
     onConfirm?.();
     setWalletsToUpdate({});
diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index aed36e44..3444f33a 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -35,59 +35,57 @@ const AccountItem = ({
   if (isHidden && !isEditing) return null;
 
   return (
-    <>
+    <div
+      className={clsx(
+        classes.accountItemContainer,
+        isHidden && classes.hiddenAccount,
+      )}
+    >
       <div
-        className={clsx(
-          classes.accountItemContainer,
-          isHidden && classes.hiddenAccount,
-        )}
+        onClick={(e) => handleChangeAccount(e, account.walletId)}
+        className={classes.leftContainer}
       >
-        <div
-          onClick={(e) => handleChangeAccount(e, account.walletId)}
-          className={classes.leftContainer}
-        >
-          <UserIcon
-            size="small"
-            icon={account?.icon ?? '👽'}
-            style={{ marginLeft: -6, marginRight: 12 }}
-          />
-          <div className={classes.accountDetails}>
-            <span
-              className={classes.accountName}
-              data-testid={`account-name-${account.name}`}
-            >
-              {account?.icnsData?.reverseResolvedName || account?.name}
-            </span>
-          </div>
-        </div>
-        <div className={classes.rightContainer}>
-          <IconButton
-            data-testid={`edit-button-${account.name}`}
-            disabled={isHidden}
-            onClick={(e) => handleEditAccount(e, account)}
+        <UserIcon
+          size="small"
+          icon={account?.icon ?? '👽'}
+          style={{ marginLeft: -6, marginRight: 12 }}
+        />
+        <div className={classes.accountDetails}>
+          <span
+            className={classes.accountName}
+            data-testid={`account-name-${account.name}`}
           >
-            <img
-              className={clsx(isHidden && classes.disabledIcon)}
-              src={BluePencil}
-            />
-          </IconButton>
-          {!(account.type === 'MNEMONIC') && (
-            <IconButton onClick={(e) => handleRemoveAccountModal(e, account)}>
-              <RemoveCircleOutline style={{ color: '#DC2626' }} />
-            </IconButton>
-          )}
-          {isEditing && (
-            <IconButton
-              onClick={(e) => {
-                toggleAccountVisibility(e, account.walletId);
-              }}
-            >
-              <img src={isHidden ? InvisibleIcon : VisibleIcon} />
-            </IconButton>
-          )}
+            {account?.icnsData?.reverseResolvedName || account?.name}
+          </span>
         </div>
       </div>
-    </>
+      <div className={classes.rightContainer}>
+        <IconButton
+          data-testid={`edit-button-${account.name}`}
+          disabled={isHidden}
+          onClick={(e) => handleEditAccount(e, account)}
+        >
+          <img
+            className={clsx(isHidden && classes.disabledIcon)}
+            src={BluePencil}
+          />
+        </IconButton>
+        {!(account.type === 'MNEMONIC') && (
+        <IconButton onClick={(e) => handleRemoveAccountModal(e, account)}>
+          <RemoveCircleOutline style={{ color: '#DC2626' }} />
+        </IconButton>
+        )}
+        {isEditing && (
+        <IconButton
+          onClick={(e) => {
+            toggleAccountVisibility(e, account.walletId);
+          }}
+        >
+          <img src={isHidden ? InvisibleIcon : VisibleIcon} />
+        </IconButton>
+        )}
+      </div>
+    </div>
   );
 };
 
diff --git a/source/components/Profile/components/AccountItem/styles.js b/source/components/Profile/components/AccountItem/styles.js
index 56b7ac87..6f92ed0b 100644
--- a/source/components/Profile/components/AccountItem/styles.js
+++ b/source/components/Profile/components/AccountItem/styles.js
@@ -5,10 +5,11 @@ export default makeStyles(() => ({
   accountItemContainer: {
     width: '100%',
     height: '52px',
-    padding: '8px 10px 8px 27px',
+    padding: '8px 21px 8px 27px',
     display: 'flex',
     flexDirection: 'row',
     alignItems: 'center',
+    justifyContent: 'space-between',
     cursor: 'pointer',
     color: '#000000',
     transition: `${SMOOTH_TRANSITION}`,
@@ -30,7 +31,6 @@ export default makeStyles(() => ({
     flexDirection: 'row',
     justifyContent: 'flex-start',
     alignItems: 'center',
-    flex: 2,
   },
   accountDetails: {
     display: 'flex',
@@ -50,11 +50,10 @@ export default makeStyles(() => ({
   },
   rightContainer: {
     display: 'flex',
+    flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'center',
     opacity: '0',
-    flex: 0.5,
-    marginLeft: 10,
 
     transition: `${SMOOTH_TRANSITION}`,
     '& > button': {
diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index ebed5808..a7a742f7 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -213,7 +213,6 @@ const Profile = ({ disableProfile }) => {
         component={(
           <div className={classes.removeAccountDialog}>
             <Typography>
-              Are you sure you want to remove Testing from your account list?
               Are you sure you want to remove <b>{selectedRemoveAccount?.name}</b> from your account list?
             </Typography>
             <Typography>
diff --git a/source/manifest.json b/source/manifest.json
index 755ea2aa..7664be13 100644
--- a/source/manifest.json
+++ b/source/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Plug",
-  "version": "0.5.2.1",
+  "version": "0.6.1",
   "icons": {
     "16": "assets/icons/favicon-16.png",
     "32": "assets/icons/favicon-32.png",
@@ -18,7 +18,9 @@
     "notifications",
     "https://kyasshu.fleek.co/*",
     "https://www.timeapi.io/api/Time/current/zone?timeZone=Etc/UTC",
-    "https://mainnet.plugwallet.ooo/*"
+    "https://mainnet.plugwallet.ooo/*",
+    "https://mainnet.dfinity.network/*",
+    "https://ic0.app/*"
   ],
   "content_security_policy": "script-src 'self' 'wasm-eval'; object-src 'self'",
   "__chrome|firefox__author": "FleekHQ",
diff --git a/source/views/Extension/Views/Home/index.jsx b/source/views/Extension/Views/Home/index.jsx
index c752e9fb..287e5b8c 100644
--- a/source/views/Extension/Views/Home/index.jsx
+++ b/source/views/Extension/Views/Home/index.jsx
@@ -24,7 +24,6 @@ import {
   getUseICNS,
   getWalletsConnectedToUrl,
   updateWalletId,
-  getWalletIds,
 } from '@modules/storageManager';
 
 const Home = () => {

From 868db3864be2fbdb6489a17871ce1c1858e9b602 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Tue, 18 Oct 2022 16:27:42 -0500
Subject: [PATCH 112/132] Version bump

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

diff --git a/package.json b/package.json
index cd575371..2ee2f2d3 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.23.2",
+    "@psychedelic/plug-controller": "0.23.4",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index cec34c98..343c2163 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.23.2":
-  version "0.23.2"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.23.2/1a7c8dccd0edc69d448c37317caf7e2c04f5a3bb#1a7c8dccd0edc69d448c37317caf7e2c04f5a3bb"
-  integrity sha512-sfShtvoIdotShcP9tOfGuB9a7XEs7qmRlQ8EbAUKdIs7wFQyLNqXOkqxCyUjbD4EsC5dtFiMo5dpZ0xGfv71Sg==
+"@psychedelic/plug-controller@0.23.4":
+  version "0.23.4"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.23.4/92ba5923065d37ea322cfc758861da0694959cfa#92ba5923065d37ea322cfc758861da0694959cfa"
+  integrity sha512-fwdlVPZidcHFt6x+o5OXKSyJi/VA7htkpZJ6UcU6WromEsBenaHKuRPdfJgJzRpY5AMWckgLKf2HVPL1fHxxJg==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 7e2e88328c7de97500097a444ebdb545b2447741 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Tue, 18 Oct 2022 16:29:44 -0500
Subject: [PATCH 113/132] Updated to latest controller version

---
 package.json |  2 +-
 yarn.lock    | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 2ee2f2d3..fafe749e 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.12",
-    "@psychedelic/plug-controller": "0.23.4",
+    "@psychedelic/plug-controller": "0.24.0",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 343c2163..73a048bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,17 +1787,31 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.23.4":
-  version "0.23.4"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.23.4/92ba5923065d37ea322cfc758861da0694959cfa#92ba5923065d37ea322cfc758861da0694959cfa"
-  integrity sha512-fwdlVPZidcHFt6x+o5OXKSyJi/VA7htkpZJ6UcU6WromEsBenaHKuRPdfJgJzRpY5AMWckgLKf2HVPL1fHxxJg==
+"@psychedelic/dab-js@1.5.0-beta.1":
+  version "1.5.0-beta.1"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.5.0-beta.1/306e2bb10491927995a3a22f25cd2ca9fd40990e#306e2bb10491927995a3a22f25cd2ca9fd40990e"
+  integrity sha512-p7GEh++Fv8U1SIYdqjxLLNy3I8fjoEF+lrXsHHKxcFuKpINxWkfWmUxLnjS6rytY+VuovrDEISFD4Tz0QHD2DQ==
+  dependencies:
+    "@dfinity/agent" "0.9.3"
+    "@dfinity/candid" "0.9.3"
+    "@dfinity/identity" "0.9.3"
+    "@dfinity/principal" "0.9.3"
+    axios "^0.24.0"
+    buffer-crc32 "^0.2.13"
+    cross-fetch "^3.1.4"
+    crypto-js "^4.1.1"
+
+"@psychedelic/plug-controller@0.24.0":
+  version "0.24.0"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.0/30ec34c8ea70423a474a0870769b705da9c6cb6a#30ec34c8ea70423a474a0870769b705da9c6cb6a"
+  integrity sha512-Jn8vonbFkp9TC3vpu8p/u5VTbwF6lTZN99CkuDC/XxR5vAfoEJuANfO17odbnl46FnkycBxk2bo0zXuW5k51GA==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"
     "@dfinity/identity" "0.9.3"
     "@dfinity/principal" "0.9.3"
     "@psychedelic/cap-js" "0.0.7"
-    "@psychedelic/dab-js" "1.4.12"
+    "@psychedelic/dab-js" "1.5.0-beta.1"
     "@types/secp256k1" "^4.0.3"
     axios "^0.21.1"
     babel-jest "^25.5.1"

From a8a88d2e6a26164d63869485fbdb16ad6b9aa161 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Tue, 18 Oct 2022 15:32:28 -0600
Subject: [PATCH 114/132] Installed latest dab-js version

---
 package.json |  2 +-
 yarn.lock    | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/package.json b/package.json
index fafe749e..d1426ef9 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "@material-ui/icons": "^4.11.2",
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
-    "@psychedelic/dab-js": "1.4.12",
+    "@psychedelic/dab-js": "1.5.0-beta.1",
     "@psychedelic/plug-controller": "0.24.0",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
diff --git a/yarn.lock b/yarn.lock
index 73a048bc..8772bbc4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1773,20 +1773,6 @@
     axios "^0.24.0"
     cross-fetch "^3.1.4"
 
-"@psychedelic/dab-js@1.4.12":
-  version "1.4.12"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.4.12/ee252e693f8606327f479cbbdbfe8424b422e8f5#ee252e693f8606327f479cbbdbfe8424b422e8f5"
-  integrity sha512-oJwMbgafesO5KOBoV70oQ929wel18n0X6u/IBtR7mcBa0SdwM2uyhbgjNqVLpFdBaVBRoAxKdCABc4sVRcqglg==
-  dependencies:
-    "@dfinity/agent" "0.9.3"
-    "@dfinity/candid" "0.9.3"
-    "@dfinity/identity" "0.9.3"
-    "@dfinity/principal" "0.9.3"
-    axios "^0.24.0"
-    buffer-crc32 "^0.2.13"
-    cross-fetch "^3.1.4"
-    crypto-js "^4.1.1"
-
 "@psychedelic/dab-js@1.5.0-beta.1":
   version "1.5.0-beta.1"
   resolved "https://npm.pkg.github.com/download/@Psychedelic/dab-js/1.5.0-beta.1/306e2bb10491927995a3a22f25cd2ca9fd40990e#306e2bb10491927995a3a22f25cd2ca9fd40990e"

From 098d0d4eec03e8847847be2187b566fb4a5d8e9b Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:13:05 -0500
Subject: [PATCH 115/132] Added getPrincipalFromPem handler

---
 source/Background/Keyring/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index 79ec8537..c9b564fa 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -110,6 +110,7 @@ export const HANDLER_TYPES = {
   IMPORT_PEM_ACCOUNT: 'import-pem-account',
   REMOVE_PEM_ACCOUNT: 'remove-pem-account',
   REMOVE_CUSTOM_TOKEN: 'remove-custom-token',
+  GET_PRINCIPAL_FROM_PEM: 'get-principal-from-pem',
 };
 
 export const getKeyringErrorMessage = (type) => ({
@@ -484,6 +485,8 @@ export const getKeyringHandler = (type, keyring) => ({
       return { error: e.message };
     }
   },
+  [HANDLER_TYPES.GET_PRINCIPAL_FROM_PEM]: async (params) => keyring.getPrincipalFromPem(params),
+
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {

From 0d42a41131ea08af4ef5359e462236110849b6a2 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:13:28 -0500
Subject: [PATCH 116/132] Call getPrincipalFromPem

---
 .../Views/ImportWallet/Steps/Step2.jsx         | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 4691dcb6..80614fd5 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -3,7 +3,7 @@ import Grid from "@material-ui/core/Grid";
 import useStyles from "../styles";
 import React, { useState } from "react";
 import { useRouter } from "@components/Router";
-import { HANDLER_TYPES, sendMessage } from "@background/Keyring";
+import { HANDLER_TYPES, sendMessage, asyncSendMessage } from "@background/Keyring";
 import Picker from "emoji-picker-react";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
@@ -17,11 +17,27 @@ const Step2 = ({ userPemFile }) => {
   const [walletName, setWalletName] = useState(""); // add deafault wallet name, for example the next wallet not used number
   const [currentEmoji, setCurrentEmoji] = useState("😎"); // add default emoji, not used in other wallets
   const [openEmojiSelector, setOpenEmojiSelector] = useState(false);
+  const [importedPrincipal, setImportedPrincipal] = useState();
 
   const { navigator } = useRouter();
 
   const classes = useStyles();
 
+  useEffect(() => {
+    let fileReader = new FileReader();
+    fileReader.readAsText(userPemFile);
+    fileReader.onloadend = () => {
+      const content = fileReader.result;
+
+      asyncSendMessage({
+        type: HANDLER_TYPES.GET_PRINCIPAL_FROM_PEM,
+        params: { pem: content },
+      }).then(setImportedPrincipal);
+    };
+  }, [userPemFile]);
+
+  console.log('imported ->', importedPrincipal);
+
   useEffect(() => {
     if (walletName && walletName !== "") {
       setDisabled(true);

From 560f44eb93c7ad363d58543c85120c683135c91e Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 20 Oct 2022 14:14:48 -0500
Subject: [PATCH 117/132] Remove extra line

---
 source/Background/Keyring/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index c9b564fa..df9fdbf1 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -486,7 +486,6 @@ export const getKeyringHandler = (type, keyring) => ({
     }
   },
   [HANDLER_TYPES.GET_PRINCIPAL_FROM_PEM]: async (params) => keyring.getPrincipalFromPem(params),
-
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {

From 66c1f2cacf0f778330c6dad238dbc58efb12bc5b Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 20 Oct 2022 15:10:56 -0500
Subject: [PATCH 118/132] controller version bump

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

diff --git a/package.json b/package.json
index d1426ef9..2cea2eab 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.5.0-beta.1",
-    "@psychedelic/plug-controller": "0.24.0",
+    "@psychedelic/plug-controller": "0.24.1",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 8772bbc4..9989b11f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.24.0":
-  version "0.24.0"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.0/30ec34c8ea70423a474a0870769b705da9c6cb6a#30ec34c8ea70423a474a0870769b705da9c6cb6a"
-  integrity sha512-Jn8vonbFkp9TC3vpu8p/u5VTbwF6lTZN99CkuDC/XxR5vAfoEJuANfO17odbnl46FnkycBxk2bo0zXuW5k51GA==
+"@psychedelic/plug-controller@0.24.1":
+  version "0.24.1"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.1/577dca2ded7248d130ab2e54b3e7ab65cba72d2a#577dca2ded7248d130ab2e54b3e7ab65cba72d2a"
+  integrity sha512-w/k35UZM3eFxFLXrQv6iHrofCQ6qxA8RdoOVy4WDVBaglf5NRKd3gFwuM+sMxBC6kY2uTpBG+pf2M7wKYUWMAQ==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 64ae4e6933cbbabac6d95f70f05feb3928e14545 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 20 Oct 2022 15:11:31 -0500
Subject: [PATCH 119/132] Added InfoModal & WalletDetailItem components

---
 source/components/InfoModal/index.jsx        | 58 +++++++++++++++++
 source/components/InfoModal/styles.js        | 12 ++++
 source/components/WalletDetailItem/index.jsx | 66 ++++++++++++++++++++
 source/components/WalletDetailItem/styles.js | 33 ++++++++++
 source/components/index.js                   |  2 +
 5 files changed, 171 insertions(+)
 create mode 100644 source/components/InfoModal/index.jsx
 create mode 100644 source/components/InfoModal/styles.js
 create mode 100644 source/components/WalletDetailItem/index.jsx
 create mode 100644 source/components/WalletDetailItem/styles.js

diff --git a/source/components/InfoModal/index.jsx b/source/components/InfoModal/index.jsx
new file mode 100644
index 00000000..20412330
--- /dev/null
+++ b/source/components/InfoModal/index.jsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import extension from 'extensionizer';
+import PropTypes from 'prop-types';
+import { Typography } from '@material-ui/core';
+import { useTranslation } from 'react-i18next';
+
+import { icIdsUrl } from '@shared/constants/urls';
+import { Button, Dialog, LinkButton } from '@components';
+
+import useStyles from './styles';
+
+const InfoModal = ({
+  title, isOpen, content, onClose, buttonText, understandButtonTestId, learnMoreButtonTestId,
+}) => {
+  const { t } = useTranslation();
+  const classes = useStyles();
+  return (
+    <Dialog
+      title={title}
+      onClose={onClose}
+      open={isOpen}
+      component={(
+        <div className={classes.modal}>
+          <Typography>{content}</Typography>
+          <Button
+            variant="rainbow"
+            value={t('common.okIUnderstand')}
+            onClick={onClose}
+            fullWidth
+            data-testid={understandButtonTestId}
+          />
+          <LinkButton
+            value={buttonText}
+            onClick={() => extension.tabs.create({ url: icIdsUrl })}
+            data-testid={learnMoreButtonTestId}
+          />
+        </div>
+      )}
+    />
+  );
+};
+
+InfoModal.propTypes = {
+  title: PropTypes.string.isRequired,
+  onClose: PropTypes.func.isRequired,
+  content: PropTypes.string.isRequired,
+  isOpen: PropTypes.bool.isRequired,
+  buttonText: PropTypes.string.isRequired,
+  learnMoreButtonTestId: PropTypes.string,
+  understandButtonTestId: PropTypes.string,
+};
+
+InfoModal.defaultProps = {
+  learnMoreButtonTestId: '',
+  understandButtonTestId: '',
+};
+
+export default InfoModal;
diff --git a/source/components/InfoModal/styles.js b/source/components/InfoModal/styles.js
new file mode 100644
index 00000000..8a231444
--- /dev/null
+++ b/source/components/InfoModal/styles.js
@@ -0,0 +1,12 @@
+import { makeStyles } from '@material-ui/core/styles';
+
+export default makeStyles(() => ({
+  modal: {
+    height: 220,
+    display: 'flex',
+    justifyContent: 'space-evenly',
+    padding: '0 20px',
+    flexDirection: 'column',
+    marginTop: -16,
+  },
+}));
diff --git a/source/components/WalletDetailItem/index.jsx b/source/components/WalletDetailItem/index.jsx
new file mode 100644
index 00000000..1711917f
--- /dev/null
+++ b/source/components/WalletDetailItem/index.jsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Typography } from '@material-ui/core';
+import { Info } from 'react-feather';
+import { useTranslation } from 'react-i18next';
+import clsx from 'clsx';
+
+import CopyButton from '../CopyButton';
+import FormItem from '../FormItem';
+import InfoModal from '../InfoModal';
+
+import useStyles from './styles';
+
+const WalletDetailItem = ({
+  value, name, setInfoOpen, isOpen, copyButtonTestId, infoIconButtonTestId, className
+}) => {
+  const classes = useStyles();
+  const { t } = useTranslation();
+  return (
+    <div className={clsx(className?.length && className)}>
+      <FormItem
+        label={t(`common.${name}`)}
+        smallLabel
+        endIcon={<CopyButton color="black" label="Copy" text={value} placement="left" data-testid={copyButtonTestId} />}
+        component={(
+          <div className={classes.ids}>
+            <Typography variant="subtitle2" className={classes.id}>{value}</Typography>
+            <Info
+              className={classes.idInfoIcon}
+              size={20}
+              onClick={() => setInfoOpen(true)}
+              data-testid={infoIconButtonTestId}
+            />
+          </div>
+        )}
+      />
+      <InfoModal
+        title={t(`walletDetails.${name}InfoTitle`)}
+        onClose={() => setInfoOpen(false)}
+        isOpen={isOpen}
+        content={t(`walletDetails.${name}Description`)}
+        buttonText={t(`walletDetails.${name}LearnMore`)}
+        understandButtonTestId={`understand-${name}-button`}
+        learnMoreButtonTestId="learn-more-button"
+      />
+    </div>
+  );
+};
+
+WalletDetailItem.propTypes = {
+  value: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  setInfoOpen: PropTypes.func.isRequired,
+  isOpen: PropTypes.bool.isRequired,
+  copyButtonTestId: PropTypes.string,
+  infoIconButtonTestId: PropTypes.string,
+  className: PropTypes.string,
+};
+
+WalletDetailItem.defaultProps = {
+  copyButtonTestId: '',
+  infoIconButtonTestId: '',
+  className: '',
+};
+
+export default WalletDetailItem;
diff --git a/source/components/WalletDetailItem/styles.js b/source/components/WalletDetailItem/styles.js
new file mode 100644
index 00000000..74d0c8f8
--- /dev/null
+++ b/source/components/WalletDetailItem/styles.js
@@ -0,0 +1,33 @@
+import { makeStyles } from '@material-ui/core/styles';
+
+export default makeStyles(() => ({
+  ids: {
+    width: '100%',
+    background: '#F3F4F6',
+    borderRadius: 10,
+    padding: '9px 85px 9px 15px',
+    wordBreak: 'break-all',
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
+    position: 'relative',
+    marginBottom: 10,
+  },
+  id: {
+    fontSize: 14,
+    color: '#000000',
+  },
+  idInfoIcon: {
+    position: 'absolute',
+    right: 15,
+    cursor: 'pointer',
+  },
+  modal: {
+    height: 220,
+    display: 'flex',
+    justifyContent: 'space-evenly',
+    padding: '0 20px',
+    flexDirection: 'column',
+    marginTop: -16,
+  },
+}));
diff --git a/source/components/index.js b/source/components/index.js
index 3805efa7..a4c768d8 100644
--- a/source/components/index.js
+++ b/source/components/index.js
@@ -69,5 +69,7 @@ export { default as Badge } from './Badge';
 export { default as Title } from './Title';
 export { default as NFTDisplayer } from './NFTDisplayer';
 export { default as ICNSDisplay } from './ICNSDisplay';
+export { default as WalletDetailItem } from './WalletDetailItem';
+export { default as InfoModal } from './InfoModal';
 
 export * from './Router';

From 5bde40699c5f4815b2319291e48d5cc1b1000e3b Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 20 Oct 2022 15:11:57 -0500
Subject: [PATCH 120/132] Used global components

---
 .../components/DetailItem/index.jsx           | 62 -------------------
 .../components/DetailItem/styles.js           | 33 ----------
 .../components/ICNSToggle/index.jsx           |  3 +-
 .../components/InfoModal/index.jsx            | 58 -----------------
 .../components/InfoModal/styles.js            | 12 ----
 .../Extension/Views/WalletDetails/index.jsx   |  6 +-
 6 files changed, 4 insertions(+), 170 deletions(-)
 delete mode 100644 source/views/Extension/Views/WalletDetails/components/DetailItem/index.jsx
 delete mode 100644 source/views/Extension/Views/WalletDetails/components/DetailItem/styles.js
 delete mode 100644 source/views/Extension/Views/WalletDetails/components/InfoModal/index.jsx
 delete mode 100644 source/views/Extension/Views/WalletDetails/components/InfoModal/styles.js

diff --git a/source/views/Extension/Views/WalletDetails/components/DetailItem/index.jsx b/source/views/Extension/Views/WalletDetails/components/DetailItem/index.jsx
deleted file mode 100644
index 1bfd1572..00000000
--- a/source/views/Extension/Views/WalletDetails/components/DetailItem/index.jsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Typography } from '@material-ui/core';
-import { Info } from 'react-feather';
-import { useTranslation } from 'react-i18next';
-
-import { CopyButton, FormItem } from '@components';
-
-import useStyles from './styles';
-import InfoModal from '../InfoModal';
-
-const DetailItem = ({
-  value, name, setInfoOpen, isOpen, copyButtonTestId, infoIconButtonTestId,
-}) => {
-  const classes = useStyles();
-  const { t } = useTranslation();
-  return (
-    <>
-      <FormItem
-        label={t(`common.${name}`)}
-        smallLabel
-        endIcon={<CopyButton color="black" label="Copy" text={value} placement="left" data-testid={copyButtonTestId} />}
-        component={(
-          <div className={classes.ids}>
-            <Typography variant="subtitle2" className={classes.id}>{value}</Typography>
-            <Info
-              className={classes.idInfoIcon}
-              size={20}
-              onClick={() => setInfoOpen(true)}
-              data-testid={infoIconButtonTestId}
-            />
-          </div>
-        )}
-      />
-      <InfoModal
-        title={t(`walletDetails.${name}InfoTitle`)}
-        onClose={() => setInfoOpen(false)}
-        isOpen={isOpen}
-        content={t(`walletDetails.${name}Description`)}
-        buttonText={t(`walletDetails.${name}LearnMore`)}
-        understandButtonTestId={`understand-${name}-button`}
-        learnMoreButtonTestId="learn-more-button"
-      />
-    </>
-  );
-};
-
-DetailItem.propTypes = {
-  value: PropTypes.string.isRequired,
-  name: PropTypes.string.isRequired,
-  setInfoOpen: PropTypes.func.isRequired,
-  isOpen: PropTypes.bool.isRequired,
-  copyButtonTestId: PropTypes.string,
-  infoIconButtonTestId: PropTypes.string,
-};
-
-DetailItem.defaultProps = {
-  copyButtonTestId: '',
-  infoIconButtonTestId: '',
-};
-
-export default DetailItem;
diff --git a/source/views/Extension/Views/WalletDetails/components/DetailItem/styles.js b/source/views/Extension/Views/WalletDetails/components/DetailItem/styles.js
deleted file mode 100644
index 74d0c8f8..00000000
--- a/source/views/Extension/Views/WalletDetails/components/DetailItem/styles.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { makeStyles } from '@material-ui/core/styles';
-
-export default makeStyles(() => ({
-  ids: {
-    width: '100%',
-    background: '#F3F4F6',
-    borderRadius: 10,
-    padding: '9px 85px 9px 15px',
-    wordBreak: 'break-all',
-    display: 'flex',
-    flexDirection: 'row',
-    alignItems: 'center',
-    position: 'relative',
-    marginBottom: 10,
-  },
-  id: {
-    fontSize: 14,
-    color: '#000000',
-  },
-  idInfoIcon: {
-    position: 'absolute',
-    right: 15,
-    cursor: 'pointer',
-  },
-  modal: {
-    height: 220,
-    display: 'flex',
-    justifyContent: 'space-evenly',
-    padding: '0 20px',
-    flexDirection: 'column',
-    marginTop: -16,
-  },
-}));
diff --git a/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx b/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx
index 95d70b12..94d014fb 100644
--- a/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/components/ICNSToggle/index.jsx
@@ -6,11 +6,10 @@ import { useTranslation } from 'react-i18next';
 import extension from 'extensionizer';
 
 import ICNS_IMG from '@assets/icons/icns.svg';
-import { Switch, Button } from '@components';
+import { Switch, Button, InfoModal } from '@components';
 
 import useStyles from './styles';
 import ICNSSelector from '../ICNSSelector';
-import InfoModal from '../InfoModal';
 
 const ICNSToggle = ({
   active,
diff --git a/source/views/Extension/Views/WalletDetails/components/InfoModal/index.jsx b/source/views/Extension/Views/WalletDetails/components/InfoModal/index.jsx
deleted file mode 100644
index 20412330..00000000
--- a/source/views/Extension/Views/WalletDetails/components/InfoModal/index.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import extension from 'extensionizer';
-import PropTypes from 'prop-types';
-import { Typography } from '@material-ui/core';
-import { useTranslation } from 'react-i18next';
-
-import { icIdsUrl } from '@shared/constants/urls';
-import { Button, Dialog, LinkButton } from '@components';
-
-import useStyles from './styles';
-
-const InfoModal = ({
-  title, isOpen, content, onClose, buttonText, understandButtonTestId, learnMoreButtonTestId,
-}) => {
-  const { t } = useTranslation();
-  const classes = useStyles();
-  return (
-    <Dialog
-      title={title}
-      onClose={onClose}
-      open={isOpen}
-      component={(
-        <div className={classes.modal}>
-          <Typography>{content}</Typography>
-          <Button
-            variant="rainbow"
-            value={t('common.okIUnderstand')}
-            onClick={onClose}
-            fullWidth
-            data-testid={understandButtonTestId}
-          />
-          <LinkButton
-            value={buttonText}
-            onClick={() => extension.tabs.create({ url: icIdsUrl })}
-            data-testid={learnMoreButtonTestId}
-          />
-        </div>
-      )}
-    />
-  );
-};
-
-InfoModal.propTypes = {
-  title: PropTypes.string.isRequired,
-  onClose: PropTypes.func.isRequired,
-  content: PropTypes.string.isRequired,
-  isOpen: PropTypes.bool.isRequired,
-  buttonText: PropTypes.string.isRequired,
-  learnMoreButtonTestId: PropTypes.string,
-  understandButtonTestId: PropTypes.string,
-};
-
-InfoModal.defaultProps = {
-  learnMoreButtonTestId: '',
-  understandButtonTestId: '',
-};
-
-export default InfoModal;
diff --git a/source/views/Extension/Views/WalletDetails/components/InfoModal/styles.js b/source/views/Extension/Views/WalletDetails/components/InfoModal/styles.js
deleted file mode 100644
index 8a231444..00000000
--- a/source/views/Extension/Views/WalletDetails/components/InfoModal/styles.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { makeStyles } from '@material-ui/core/styles';
-
-export default makeStyles(() => ({
-  modal: {
-    height: 220,
-    display: 'flex',
-    justifyContent: 'space-evenly',
-    padding: '0 20px',
-    flexDirection: 'column',
-    marginTop: -16,
-  },
-}));
diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index e3c049c2..261966ae 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -35,11 +35,11 @@ import {
   ConnectAccountsModal,
   Header,
   LinkButton,
+  WalletDetailItem,
 } from '@components';
 import { setUseICNS as setStorageUseICNS} from '@modules/storageManager';
 
 import useStyles from './styles';
-import DetailItem from './components/DetailItem';
 import ICNSToggle from './components/ICNSToggle';
 
 const WalletDetails = () => {
@@ -415,7 +415,7 @@ const WalletDetails = () => {
         </div>
         {expand && (
           <div className={classes.detailsContainer}>
-            <DetailItem
+            <WalletDetailItem
               name="principalId"
               value={principalId}
               setInfoOpen={setOpenPrincipal}
@@ -423,7 +423,7 @@ const WalletDetails = () => {
               copyButtonTestId="copy-principalId-button"
               infoIconButtonTestId="info-principalId-icon-button"
             />
-            <DetailItem
+            <WalletDetailItem
               name="accountId"
               value={accountId}
               setInfoOpen={setOpenAccount}

From 7a19c728897b17751cd041a131f418dd0ee940f6 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Thu, 20 Oct 2022 15:12:17 -0500
Subject: [PATCH 121/132] Displayed PrincipalId on import pem

---
 .../Views/ImportWallet/Steps/Step2.jsx        | 35 ++++++++++++++-----
 .../Extension/Views/ImportWallet/styles.js    |  3 ++
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 80614fd5..29856b2b 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -1,12 +1,19 @@
-import { Container, Button, TextInput, FormItem, UserIcon } from "@components";
+import React, { useEffect, useState } from "react";
 import Grid from "@material-ui/core/Grid";
-import useStyles from "../styles";
-import React, { useState } from "react";
-import { useRouter } from "@components/Router";
-import { HANDLER_TYPES, sendMessage, asyncSendMessage } from "@background/Keyring";
 import Picker from "emoji-picker-react";
-import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
+import { HANDLER_TYPES, sendMessage, asyncSendMessage } from "@background/Keyring";
+import {
+  Container,
+  Button,
+  TextInput,
+  FormItem,
+  UserIcon,
+  WalletDetailItem,
+} from "@components";
+import { useRouter } from "@components/Router";
+
+import useStyles from "../styles";
 
 const Step2 = ({ userPemFile }) => {
   const { t } = useTranslation();
@@ -18,6 +25,7 @@ const Step2 = ({ userPemFile }) => {
   const [currentEmoji, setCurrentEmoji] = useState("😎"); // add default emoji, not used in other wallets
   const [openEmojiSelector, setOpenEmojiSelector] = useState(false);
   const [importedPrincipal, setImportedPrincipal] = useState();
+  const [detailsModal, setDetailsModal] = useState(false);
 
   const { navigator } = useRouter();
 
@@ -36,8 +44,6 @@ const Step2 = ({ userPemFile }) => {
     };
   }, [userPemFile]);
 
-  console.log('imported ->', importedPrincipal);
-
   useEffect(() => {
     if (walletName && walletName !== "") {
       setDisabled(true);
@@ -75,6 +81,10 @@ const Step2 = ({ userPemFile }) => {
     };
   };
 
+  const openDetailsModal = () => {
+    setDetailsModal(!detailsModal);
+  };
+
   return (
     <Container>
       <Grid container spacing={2}>
@@ -125,6 +135,15 @@ const Step2 = ({ userPemFile }) => {
               />
             }
           />
+          <WalletDetailItem
+            name="principalId"
+            value={importedPrincipal}
+            className={classes.principalDetails}
+            setInfoOpen={setDetailsModal}
+            isOpen={detailsModal}
+            copyButtonTestId="copy-principalId-button"
+            infoIconButtonTestId="info-principalId-icon-button"
+          />
           <Button
             variant="rainbow"
             value={t("common.save")}
diff --git a/source/views/Extension/Views/ImportWallet/styles.js b/source/views/Extension/Views/ImportWallet/styles.js
index 9d272b9c..d87d4663 100644
--- a/source/views/Extension/Views/ImportWallet/styles.js
+++ b/source/views/Extension/Views/ImportWallet/styles.js
@@ -47,6 +47,9 @@ export default makeStyles((theme) => ({
   formItem: {
     marginBottom: 35,
   },
+  principalDetails: {
+    marginBottom: 30,
+  },
   inputFileLabel: {
     textDecorationLine: 'underline',
     textDecorationColor: '#3574F4',

From ee555de616a814b17c345543d8dd676f7ef9eb07 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 24 Oct 2022 12:37:02 -0500
Subject: [PATCH 122/132] Bumped plug-controller version

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

diff --git a/package.json b/package.json
index 2cea2eab..f0d1a1bb 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.5.0-beta.1",
-    "@psychedelic/plug-controller": "0.24.1",
+    "@psychedelic/plug-controller": "0.24.3",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 9989b11f..612999a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.24.1":
-  version "0.24.1"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.1/577dca2ded7248d130ab2e54b3e7ab65cba72d2a#577dca2ded7248d130ab2e54b3e7ab65cba72d2a"
-  integrity sha512-w/k35UZM3eFxFLXrQv6iHrofCQ6qxA8RdoOVy4WDVBaglf5NRKd3gFwuM+sMxBC6kY2uTpBG+pf2M7wKYUWMAQ==
+"@psychedelic/plug-controller@0.24.3":
+  version "0.24.3"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.3/f150066563e837bde728b059e061dd8abdb02bfc#f150066563e837bde728b059e061dd8abdb02bfc"
+  integrity sha512-amRsv2TFVeTwVzIh36izVxiLK+/jqudxMtZrCOEFkKjZ+LVgJ5Slt/6kc/VWUDxuzlPfJfpmN0ZytwxTE66zDw==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 13bf84e106f1d23b919681dc17a21beb41b84f1b Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 24 Oct 2022 12:37:29 -0500
Subject: [PATCH 123/132] Added validate pem handler

---
 source/Background/Keyring/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/Background/Keyring/index.js b/source/Background/Keyring/index.js
index df9fdbf1..6d5825d3 100644
--- a/source/Background/Keyring/index.js
+++ b/source/Background/Keyring/index.js
@@ -111,6 +111,7 @@ export const HANDLER_TYPES = {
   REMOVE_PEM_ACCOUNT: 'remove-pem-account',
   REMOVE_CUSTOM_TOKEN: 'remove-custom-token',
   GET_PRINCIPAL_FROM_PEM: 'get-principal-from-pem',
+  VALIDATE_PEM: 'validate-pem',
 };
 
 export const getKeyringErrorMessage = (type) => ({
@@ -197,7 +198,7 @@ export const getKeyringHandler = (type, keyring) => ({
       return null;
     }
   },
-  [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: async (params) => keyring.importAccountFromPem(params),
+  [HANDLER_TYPES.IMPORT_PEM_ACCOUNT]: keyring.importAccountFromPem,
   [HANDLER_TYPES.CREATE_PRINCIPAL]: async (params) => keyring.createPrincipal(params),
   [HANDLER_TYPES.REMOVE_PEM_ACCOUNT]: async (params) => keyring.deleteImportedAccount(params),
   [HANDLER_TYPES.SET_CURRENT_PRINCIPAL]:
@@ -485,7 +486,8 @@ export const getKeyringHandler = (type, keyring) => ({
       return { error: e.message };
     }
   },
-  [HANDLER_TYPES.GET_PRINCIPAL_FROM_PEM]: async (params) => keyring.getPrincipalFromPem(params),
+  [HANDLER_TYPES.GET_PRINCIPAL_FROM_PEM]: keyring.getPrincipalFromPem,
+  [HANDLER_TYPES.VALIDATE_PEM]: keyring.validatePem,
 }[type]);
 
 export const getContacts = () => new Promise((resolve, reject) => {

From ee6f1e79fb0cc37ae61510081617dc3606f1d2f3 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 24 Oct 2022 12:38:21 -0500
Subject: [PATCH 124/132] Added validate pemfile logic

---
 .../Views/ImportWallet/Steps/Step1.jsx        | 31 ++++++++-------
 .../Views/ImportWallet/hooks/useSteps.jsx     | 39 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
index d0a46fcb..5a25e603 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step1.jsx
@@ -1,31 +1,32 @@
-import { Container, Button } from "@components";
 import React, { useState, useCallback, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useDropzone } from "react-dropzone";
-import useStyles from "../styles";
 import { CloudUpload } from "@material-ui/icons";
-import GradientFile from "@assets/icons/gradient-file.svg";
-import { Typography, Grid } from "@material-ui/core";
-import { Plug } from "@components";
 import CloseIcon from "@material-ui/icons/Close";
+import { Typography, Grid } from "@material-ui/core";
 
-const Step1 = ({ handleChangeStep, setUserPemFile, userPemFile }) => {
+import { Container, Button, Plug } from "@components";
+import GradientFile from "@assets/icons/gradient-file.svg";
+
+import useStyles from "../styles";
+
+const Step1 = ({
+  handleChangeStep,
+  setUserPemFile,
+  userPemFile,
+  loadingValidate,
+  isPemValid,
+  importDisabled,
+}) => {
   const { t } = useTranslation();
   const classes = useStyles();
 
-  const [loading, setLoading] = useState(false);
-  const [disabled, setDisabled] = useState(false);
-
   const handleRemoveFile = () => {
-    setDisabled(false);
     setUserPemFile(null);
   };
 
   const onDrop = useCallback((acceptedFile) => {
-    setLoading(true);
     setUserPemFile(acceptedFile[0]);
-    setDisabled(true);
-    setLoading(false);
   }, []);
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
@@ -91,8 +92,8 @@ const Step1 = ({ handleChangeStep, setUserPemFile, userPemFile }) => {
             variant="rainbow"
             value={t("common.continue")}
             onClick={() => handleChangeStep(1)}
-            loading={loading}
-            disabled={!disabled}
+            loading={loadingValidate}
+            disabled={importDisabled}
             fullWidth
             data-testid="add-button"
           />
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index 0d204d9b..bd00f8de 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -1,4 +1,6 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
+import { HANDLER_TYPES, sendMessage } from "@background/Keyring";
+import { toast } from 'react-toastify';
 import { LinkButton } from '@components';
 import { useTranslation } from 'react-i18next';
 import { useRouter } from '@components/Router';
@@ -12,6 +14,8 @@ const useSteps = () => {
   const { t } = useTranslation();
 
   const [userPemFile, setUserPemFile] = useState(null);
+  const [validateLoading, setValidateLoading] = useState(false);
+  const [importDisabled, setImportDisabled] = useState(true);
 
   const handleChangeStep = (index) => setStep(index);
   const handleClose = () => navigator.navigate('home');
@@ -19,11 +23,42 @@ const useSteps = () => {
   const leftButton = (onClick) => <LinkButton value={t('common.back')} onClick={onClick} startIcon={BackIcon} />;
   const rightButton = <LinkButton value={t('common.close')} onClick={handleClose} />;
 
+  useEffect(() => {
+    if (userPemFile === null) {
+      setImportDisabled(true);
+      return;
+    }
 
+    setValidateLoading(true);
+    let fileReader = new FileReader();
+    fileReader.readAsText(userPemFile);
+    fileReader.onloadend = async () => {
+      const content = fileReader.result;
+
+      sendMessage({
+        type: HANDLER_TYPES.VALIDATE_PEM,
+        params: { pem: content },
+      }, (validPem) => {
+        if (!validPem) {
+          toast('Invalid PEM file', { type: 'error' });
+        }
+        setValidateLoading(false);
+        setImportDisabled(!validPem);
+      });
+    };
+  }, [userPemFile]);
 
   const steps = [
     {
-      component: <Step1 handleChangeStep={handleChangeStep} setUserPemFile={setUserPemFile} userPemFile={userPemFile} />,
+      component: (
+        <Step1
+          handleChangeStep={handleChangeStep}
+          setUserPemFile={setUserPemFile}
+          validateLoading={validateLoading}
+          importDisabled={importDisabled}
+          userPemFile={userPemFile}
+        />
+      ),
       left: leftButton(() => handleClose()),
       right: rightButton,
       center: `${t("importPem.importPEMfile")}`,

From efa4b2afef24ea8ddda907cd9d9d9ae433f8ab37 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 24 Oct 2022 12:39:09 -0500
Subject: [PATCH 125/132] Removed clsx

---
 source/components/WalletDetailItem/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/components/WalletDetailItem/index.jsx b/source/components/WalletDetailItem/index.jsx
index 1711917f..7d0a4016 100644
--- a/source/components/WalletDetailItem/index.jsx
+++ b/source/components/WalletDetailItem/index.jsx
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { Typography } from '@material-ui/core';
 import { Info } from 'react-feather';
 import { useTranslation } from 'react-i18next';
-import clsx from 'clsx';
 
 import CopyButton from '../CopyButton';
 import FormItem from '../FormItem';
@@ -17,7 +16,7 @@ const WalletDetailItem = ({
   const classes = useStyles();
   const { t } = useTranslation();
   return (
-    <div className={clsx(className?.length && className)}>
+    <div className={className}>
       <FormItem
         label={t(`common.${name}`)}
         smallLabel

From 313687746112a06f239565e55ecfc89f991a5f44 Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Mon, 24 Oct 2022 12:40:32 -0500
Subject: [PATCH 126/132] Improved naming

---
 source/views/Extension/Views/ImportWallet/Steps/Step2.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
index 29856b2b..c98a21de 100644
--- a/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
+++ b/source/views/Extension/Views/ImportWallet/Steps/Step2.jsx
@@ -25,7 +25,7 @@ const Step2 = ({ userPemFile }) => {
   const [currentEmoji, setCurrentEmoji] = useState("😎"); // add default emoji, not used in other wallets
   const [openEmojiSelector, setOpenEmojiSelector] = useState(false);
   const [importedPrincipal, setImportedPrincipal] = useState();
-  const [detailsModal, setDetailsModal] = useState(false);
+  const [detailsModalOpen, setDetailsModal] = useState(false);
 
   const { navigator } = useRouter();
 
@@ -82,7 +82,7 @@ const Step2 = ({ userPemFile }) => {
   };
 
   const openDetailsModal = () => {
-    setDetailsModal(!detailsModal);
+    setDetailsModal(!detailsModalOpen);
   };
 
   return (
@@ -140,7 +140,7 @@ const Step2 = ({ userPemFile }) => {
             value={importedPrincipal}
             className={classes.principalDetails}
             setInfoOpen={setDetailsModal}
-            isOpen={detailsModal}
+            isOpen={detailsModalOpen}
             copyButtonTestId="copy-principalId-button"
             infoIconButtonTestId="info-principalId-icon-button"
           />

From 9875f90322746afe946795efab99f9980ad6dea8 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Mon, 24 Oct 2022 13:42:59 -0600
Subject: [PATCH 127/132] Use hardcoded url for icns background

---
 source/components/ICNSDisplay/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/components/ICNSDisplay/index.jsx b/source/components/ICNSDisplay/index.jsx
index b19bef03..a6058559 100644
--- a/source/components/ICNSDisplay/index.jsx
+++ b/source/components/ICNSDisplay/index.jsx
@@ -11,14 +11,13 @@ const ICNSDisplay = ({
 }) => {
   const classes = useStyles();
   const [loading, setLoading] = useState(true);
-
   return (
     <div className={`${className} ${classes.wrapper} ${loading ? classes.loadingWrapper : ''}`}>
       <img
         className={classes.icnsBackground}
         onClick={onClick}
         onLoad={() => setLoading(false)}
-        src={icns.url}
+        src="https://icns.id/Rectangle.jpg"
       />
       <span className={`${classes.icnsName} ${large ? classes.large : ''}`}>
         {icns.name?.length > 12 ? shortICNSName(icns?.name) : icns?.name}

From 4cc126b74c815fc543a4b3a34c7454a5802a7771 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Mon, 24 Oct 2022 14:53:02 -0600
Subject: [PATCH 128/132] Fixed syntax error causing screen to crash. Removed
 unnecessary state field

---
 source/views/Extension/Views/WalletDetails/index.jsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/source/views/Extension/Views/WalletDetails/index.jsx b/source/views/Extension/Views/WalletDetails/index.jsx
index 261966ae..d9a8fed4 100644
--- a/source/views/Extension/Views/WalletDetails/index.jsx
+++ b/source/views/Extension/Views/WalletDetails/index.jsx
@@ -64,7 +64,6 @@ const WalletDetails = () => {
   const [connectedWallets, setConnectedWallets] = useState([]);
   const [tab, setTab] = useState(null);
   const [app, setApp] = useState(null);
-  const [accountSwitchId, setAccountSwitchId] = useState(walletId);
   const [accounts, setAccounts] = useState([]);
   const [openEmojis, setOpenEmojis] = useState(false);
   const [walletName, setWalletName] = useState(name);
@@ -218,9 +217,6 @@ const WalletDetails = () => {
       const url = getTabURL(tabs?.[0]);
       const ids = accounts.map((account) => account.walletId);
       setTab(tabs?.[0]);
-      // Check if new wallet is connected to the current page
-      setAccountSwitchId(walletId);
-
       if (!ids.length) {
         executeAccountSwitch(walletId);
         return;
@@ -246,12 +242,12 @@ const WalletDetails = () => {
   };
 
   const executeAccountSwitch = (wallet) => {
-    sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: accountSwitchId },
+    sendMessage({ type: HANDLER_TYPES.SET_CURRENT_PRINCIPAL, params: wallet },
       (state) => {
         if (Object.values(state?.wallets).length) {
           const newWallet = state.wallets[state.currentWalletId];
           dispatch(setAccountInfo(newWallet));
-          dipatch(getContacts());
+          dispatch(getContacts());
           dispatch(setICNSData(newWallet.icnsData));
           dispatch(setAssetsLoading(true));
           dispatch(setTransactions([]));
@@ -275,7 +271,7 @@ const WalletDetails = () => {
   useEffect(() => {
     sendMessage({ type: HANDLER_TYPES.GET_STATE, params: {} }, (state) => {
       if (Object.keys(state?.wallets)?.length) {
-        setAccounts(state.wallets);
+        setAccounts(Object.values(state.wallets));
       }
     });
   }, []);

From 065bc0f96052ded85dd7b1aa9d830d973fce35d1 Mon Sep 17 00:00:00 2001
From: rocky-fleek <tomas@fleek.co>
Date: Mon, 24 Oct 2022 14:57:33 -0600
Subject: [PATCH 129/132] Fixed issue where account switch only happened if
 clicking on the account name

---
 source/components/Profile/components/AccountItem/index.jsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/components/Profile/components/AccountItem/index.jsx b/source/components/Profile/components/AccountItem/index.jsx
index 3444f33a..4676c777 100644
--- a/source/components/Profile/components/AccountItem/index.jsx
+++ b/source/components/Profile/components/AccountItem/index.jsx
@@ -40,11 +40,9 @@ const AccountItem = ({
         classes.accountItemContainer,
         isHidden && classes.hiddenAccount,
       )}
+      onClick={(e) => handleChangeAccount(e, account.walletId)}
     >
-      <div
-        onClick={(e) => handleChangeAccount(e, account.walletId)}
-        className={classes.leftContainer}
-      >
+      <div className={classes.leftContainer}>
         <UserIcon
           size="small"
           icon={account?.icon ?? '👽'}

From a1cb08638bf9dbe3d9dffa5726d7ef806adc5f7a Mon Sep 17 00:00:00 2001
From: Cancu <juancruz.cancu@gmail.com>
Date: Mon, 24 Oct 2022 18:05:12 -0300
Subject: [PATCH 130/132] redirect to main account when delete the one you are
 in

---
 source/components/Profile/index.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index a124e811..f5712f13 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -199,10 +199,9 @@ const Profile = ({ disableProfile }) => {
     sendMessage({
       type: HANDLER_TYPES.REMOVE_PEM_ACCOUNT,
       params: selectedRemoveAccount.walletId,
-    });
+    }, () => executeAccountSwitch(accounts[0].walletId));
     setOpenRemoveModal(false);
     setOpen(false);
-    navigator.navigate('home');
   };
 
   return (

From 02fccdcb1b9998e05d89cbffe448c5c7328f7528 Mon Sep 17 00:00:00 2001
From: tomiir <rocchitomas@gmail.com>
Date: Tue, 25 Oct 2022 07:42:14 -0600
Subject: [PATCH 131/132] Installed latest controller with validate_pem fixes.
 Added translation for validate pem messages. Made error toast generic (#653)

Co-authored-by: rocky-fleek <tomas@fleek.co>
---
 package.json                                           |  2 +-
 source/locales/en/translation.json                     |  4 ++++
 .../Extension/Views/ImportWallet/hooks/useSteps.jsx    | 10 ++++++----
 yarn.lock                                              |  8 ++++----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index f0d1a1bb..8865fae7 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.5.0-beta.1",
-    "@psychedelic/plug-controller": "0.24.3",
+    "@psychedelic/plug-controller": "0.24.4",
     "@psychedelic/plug-inpage-provider": "^2.3.1",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",
diff --git a/source/locales/en/translation.json b/source/locales/en/translation.json
index 6ffdbca8..aa91353f 100644
--- a/source/locales/en/translation.json
+++ b/source/locales/en/translation.json
@@ -21,6 +21,10 @@
     "copyTextAddress": "Copy address to clipboard",
     "copiedText": "Copied!"
   },
+  "importPEM": {
+    "added-account": "Account already added",
+    "invalid-key": "Invalid PEM file"
+  },
   "profile": {
     "myAccounts": "My Accounts",
     "createAccount": "Create Account",
diff --git a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
index bd00f8de..8f7384d8 100644
--- a/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
+++ b/source/views/Extension/Views/ImportWallet/hooks/useSteps.jsx
@@ -38,12 +38,14 @@ const useSteps = () => {
       sendMessage({
         type: HANDLER_TYPES.VALIDATE_PEM,
         params: { pem: content },
-      }, (validPem) => {
-        if (!validPem) {
-          toast('Invalid PEM file', { type: 'error' });
+      }, (response) => {
+        const { isValid, errorType } = response;
+        if (!isValid) {
+          toast(t(`importPEM.${errorType}`), { type: 'error' });
+          setUserPemFile(null);
         }
         setValidateLoading(false);
-        setImportDisabled(!validPem);
+        setImportDisabled(!isValid);
       });
     };
   }, [userPemFile]);
diff --git a/yarn.lock b/yarn.lock
index 612999a4..690b597d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1787,10 +1787,10 @@
     cross-fetch "^3.1.4"
     crypto-js "^4.1.1"
 
-"@psychedelic/plug-controller@0.24.3":
-  version "0.24.3"
-  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.3/f150066563e837bde728b059e061dd8abdb02bfc#f150066563e837bde728b059e061dd8abdb02bfc"
-  integrity sha512-amRsv2TFVeTwVzIh36izVxiLK+/jqudxMtZrCOEFkKjZ+LVgJ5Slt/6kc/VWUDxuzlPfJfpmN0ZytwxTE66zDw==
+"@psychedelic/plug-controller@0.24.4":
+  version "0.24.4"
+  resolved "https://npm.pkg.github.com/download/@Psychedelic/plug-controller/0.24.4/7c71cf00d570b5792fb43513b13cf156f4d05ce6#7c71cf00d570b5792fb43513b13cf156f4d05ce6"
+  integrity sha512-iYXhvsGgRLExLt9J58QJ2xU2YVFobvB+2HI4WZ5KcbPvzGeDZsMsjUSTnNXiqXVn3wzjtzp0ks+gG2K/DslTdw==
   dependencies:
     "@dfinity/agent" "0.9.3"
     "@dfinity/candid" "0.9.3"

From 9e2e2a794d9eb4d14ad519cb26c7d86b0e6836cc Mon Sep 17 00:00:00 2001
From: Juan Manuel <44899916+angarita-dev@users.noreply.github.com>
Date: Tue, 25 Oct 2022 11:49:35 -0500
Subject: [PATCH 132/132] Conditional render for import wallet in firefox

---
 source/components/Profile/index.jsx | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/source/components/Profile/index.jsx b/source/components/Profile/index.jsx
index a124e811..fe68da4e 100644
--- a/source/components/Profile/index.jsx
+++ b/source/components/Profile/index.jsx
@@ -42,6 +42,8 @@ import { AccountItem } from './components';
 import UserIcon from '../UserIcon';
 import useStyles from './styles';
 
+const IMPORT_WALLET_ENABLED = process.env.TARGET_BROWSER !== 'firefox';
+
 const Profile = ({ disableProfile }) => {
   const classes = useStyles();
   const { t } = useTranslation();
@@ -205,6 +207,7 @@ const Profile = ({ disableProfile }) => {
     navigator.navigate('home');
   };
 
+
   return (
     <>
       <Dialog
@@ -331,15 +334,17 @@ const Profile = ({ disableProfile }) => {
                   onClick={handleOpenCreateAccount}
                   data-testid="create-account-button"
                 />
-                <MenuItem
-                  size="small"
-                  key="createAccount"
-                  name={t('profile.importWallet')}
-                  alignLeft
-                  logo={LinkEmoji}
-                  onClick={handleOpenImportWallet}
-                  data-testid="create-account-button"
-                />
+                { IMPORT_WALLET_ENABLED && (
+                  <MenuItem
+                    size="small"
+                    key="createAccount"
+                    name={t('profile.importWallet')}
+                    alignLeft
+                    logo={LinkEmoji}
+                    onClick={handleOpenImportWallet}
+                    data-testid="create-account-button"
+                  />
+                )}
                 <Divider style={{ margin: '6px 0' }} />
                 {
                   menuItems.map((item) => (